summaryrefslogtreecommitdiffstats
path: root/res/values-ja
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-03-20 16:46:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-20 16:46:46 +0000
commitb32cd38d6ca493eca21a8538649e833a271ea980 (patch)
treed66ce5a2234839de7f58d7d3611f3e4c209e0aa6 /res/values-ja
parentc6b097a06775cfcb7defcaefbea424b9651ababb (diff)
parent67436bf1a195bc7b5ad4e6f3e7fbf5f5d889642e (diff)
downloadandroid_packages_apps_Trebuchet-b32cd38d6ca493eca21a8538649e833a271ea980.tar.gz
android_packages_apps_Trebuchet-b32cd38d6ca493eca21a8538649e833a271ea980.tar.bz2
android_packages_apps_Trebuchet-b32cd38d6ca493eca21a8538649e833a271ea980.zip
am 67436bf1: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '67436bf1a195bc7b5ad4e6f3e7fbf5f5d889642e':
Diffstat (limited to 'res/values-ja')
0 files changed, 0 insertions, 0 deletions