diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-25 18:59:04 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 18:59:04 +0000 |
commit | 38de1b5a9cb49553d363f7e3faa5d51804ccb66c (patch) | |
tree | 2573efb0c6cc4acb58ff5179ffa43c6408e82d4b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7b9ab8225217fe371400698a8f5685e7e95491ab (diff) | |
parent | 252044e5e067367ac5cd1c75afcb2fcafeedde64 (diff) |
am 252044e5: (-s ours) am 8403b9b7: (-s ours) am 437ee52a: (-s ours) am 2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '252044e5e067367ac5cd1c75afcb2fcafeedde64':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions