summaryrefslogtreecommitdiffstats
path: root/res/values-am/strings.xml
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-01 07:54:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-01 07:54:42 -0700
commit5eb3a72524481aaff0e52bbb0ba42b5e125fe4ef (patch)
treeeb6b23cff810970054064862da2d14f98f1320f6 /res/values-am/strings.xml
parente760c7d21d95464e2bee9ec546b708df5e06e2fe (diff)
parentc8a5ea665182c454d1e4889b8c2727750383e9d6 (diff)
downloadandroid_packages_apps_Trebuchet-5eb3a72524481aaff0e52bbb0ba42b5e125fe4ef.tar.gz
android_packages_apps_Trebuchet-5eb3a72524481aaff0e52bbb0ba42b5e125fe4ef.tar.bz2
android_packages_apps_Trebuchet-5eb3a72524481aaff0e52bbb0ba42b5e125fe4ef.zip
am c8a5ea66: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'c8a5ea665182c454d1e4889b8c2727750383e9d6':
Diffstat (limited to 'res/values-am/strings.xml')
0 files changed, 0 insertions, 0 deletions