summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-03-14 10:02:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 10:02:46 +0000
commitecc47ce16fceba94f150ff02f7c3ad7f2aa8404c (patch)
tree1b252b6495e62dae7a3210cfbc19b2c41c13d41f /src/com/android
parentc4fa3a727bb66e36ba0a321e5c3273c09583c341 (diff)
parent4323f74aa197701b7b1ea8c45993f57563208810 (diff)
downloadpackages_apps_Settings-ecc47ce16fceba94f150ff02f7c3ad7f2aa8404c.tar.gz
packages_apps_Settings-ecc47ce16fceba94f150ff02f7c3ad7f2aa8404c.tar.bz2
packages_apps_Settings-ecc47ce16fceba94f150ff02f7c3ad7f2aa8404c.zip
am 4323f74a: (-s ours) am 5969801c: (-s ours) am a60df014: (-s ours) am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '4323f74aa197701b7b1ea8c45993f57563208810': Import translations. DO NOT MERGE
Diffstat (limited to 'src/com/android')
0 files changed, 0 insertions, 0 deletions