diff options
| author | Geoff Mendal <mendal@google.com> | 2014-10-28 07:28:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-28 07:28:33 +0000 |
| commit | 6ac154964f8d67f0b6e6009c8b1d451d5a916ba6 (patch) | |
| tree | def8f56cf05104347fd673af79e573dbc4dd5793 /AndroidManifest.xml | |
| parent | a9cc47b11f1b0b4ecea1cbe2aeb1648ab6ed06dd (diff) | |
| parent | 22fdd78ac41d2cea06cc8401960b1a7f53dd2df9 (diff) | |
am 22fdd78a: (-s ours) am 17ea9d25: (-s ours) am 076e9841: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '22fdd78ac41d2cea06cc8401960b1a7f53dd2df9':
Import translations. DO NOT MERGE
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions