diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-01 16:54:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 16:54:25 +0000 |
| commit | 6afc39822e0b98000bed7846669106bb4a0805bc (patch) | |
| tree | 98e7456eec6fc6df6b7478bde91a23599e013a37 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ed133f9c4a907f111ef639fcd56ddad865c0fcd4 (diff) | |
| parent | 9bc4bdea43d9cea237b1f96e737d03efa6c0b802 (diff) | |
am 9bc4bdea: (-s ours) am 1491492a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '9bc4bdea43d9cea237b1f96e737d03efa6c0b802':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions