diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-05 15:37:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 15:37:39 +0000 |
commit | 7116e69ad75bd5cd9b33ddbe294393e690d84696 (patch) | |
tree | a487744f0d11f1d8c3f280cbcf8ec57d137b15bc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a49252ddd1355f55375ce4dcdbe945130ccbe19b (diff) | |
parent | 8a051583acdf6200f7f2a42a52ed86d1f7bac47a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6a215c34e9 -s ours am: bba456186d -s ours am: a4a5213ce8 -s ours am: 8a051583ac -s ours
am skip reason: subject contains skip directive
Change-Id: Id51687691d840a64ba848a428ea1843dc86a0ae9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions