diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-31 02:51:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 02:51:58 +0000 |
| commit | 50265fc2a316b9a2cea168c086b44280371b04e0 (patch) | |
| tree | 59d106dd27440769ec73db75d96875b5dfad301f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fc1bcc37a6ebc466306f2b33c57e95cea69b693c (diff) | |
| parent | 44718c4b8b3c7655ecc34981c8ee41e1daf34f00 (diff) | |
am 44718c4b: (-s ours) am bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '44718c4b8b3c7655ecc34981c8ee41e1daf34f00':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions