diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-25 18:58:57 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 18:58:57 +0000 |
commit | 7b9ab8225217fe371400698a8f5685e7e95491ab (patch) | |
tree | 2573efb0c6cc4acb58ff5179ffa43c6408e82d4b /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 3d601990c8be7bdc83e199ae3f855d39de9d2ca8 (diff) | |
parent | e8b72edb1878aceeaabe13d3cc1b68eb81e8cc03 (diff) |
am e8b72edb: (-s ours) am b4f7abbd: (-s ours) am 56c2f8ee: (-s ours) am 4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'e8b72edb1878aceeaabe13d3cc1b68eb81e8cc03':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions