diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-06 23:04:31 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-06 23:04:31 -0700 |
commit | 4b6bdcb4bb7b189f8b4e8132a59c6fe70a7f5d11 (patch) | |
tree | 25605245d049811c8c22c50d99d294fc6f2afff8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 24911c9bdd5808b57787243e677e948d51eb9254 (diff) | |
parent | 6f61332df5464ad906466fb58e27214b441825fe (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7b6247f7a3 -s ours
am: 6f61332df5 -s ours
Change-Id: I46f9a2f50fefa9c039fa2f6db95046b1070bddbf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions