diff options
author | Geoff Mendal <mendal@google.com> | 2015-08-08 14:34:34 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-08 14:34:34 +0000 |
commit | cc92ae9871acdb4d15e2badbfe37e8cdebffe639 (patch) | |
tree | 1bb2deb78d04073639407a0793b12e1ada57f25b /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 6468a29765cefff2ae094896dd2ce4092b5d2049 (diff) | |
parent | 2c9971498b7cd0701c069f228cca86e95c58f8be (diff) |
am 2c997149: (-s ours) am ba4a568c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '2c9971498b7cd0701c069f228cca86e95c58f8be':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions