diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-12-05 13:01:02 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-05 13:01:02 -0800 |
| commit | 96e08d1961b21977f574abf7055f89993493f984 (patch) | |
| tree | 626fc0fd75ab124b8acab432b1048bda3c63b387 /res/values-am/strings.xml | |
| parent | a87df26fc2facccc8930abbf87decaad852fff60 (diff) | |
| parent | 1aa371fcaf8ddec7fbd4368bd13420eaf3e5b1b6 (diff) | |
| download | packages_apps_Settings-96e08d1961b21977f574abf7055f89993493f984.tar.gz packages_apps_Settings-96e08d1961b21977f574abf7055f89993493f984.tar.bz2 packages_apps_Settings-96e08d1961b21977f574abf7055f89993493f984.zip | |
am 1aa371fc: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '1aa371fcaf8ddec7fbd4368bd13420eaf3e5b1b6':
Diffstat (limited to 'res/values-am/strings.xml')
0 files changed, 0 insertions, 0 deletions