summaryrefslogtreecommitdiffstats
path: root/res/values-ja
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2012-09-06 11:19:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-06 11:19:02 -0700
commit2ec3622a9927681aa90a4ef61cb965354d388790 (patch)
tree3d8a71a9ada694254aad3fc9883888d9b50d2a71 /res/values-ja
parentc4e8757cd963cd58b3a46247173079129e9a299d (diff)
parent2c705626e5cfa29adddb0f82fca261560d4fd9a8 (diff)
downloadpackages_apps_settings-2ec3622a9927681aa90a4ef61cb965354d388790.zip
packages_apps_settings-2ec3622a9927681aa90a4ef61cb965354d388790.tar.gz
packages_apps_settings-2ec3622a9927681aa90a4ef61cb965354d388790.tar.bz2
am 2c705626: (-s ours) am d4e216bc: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '2c705626e5cfa29adddb0f82fca261560d4fd9a8': Revert "Import translations. DO NOT MERGE"
Diffstat (limited to 'res/values-ja')
0 files changed, 0 insertions, 0 deletions