diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-11 19:21:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-11 19:21:37 +0000 |
commit | 15f35772357e600bd1cc8f24b78627b1ebd4b55a (patch) | |
tree | 1ddd4195f25430b77a625a13a56fd1086e957398 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 9604bd26adea401f5db7673f8455e12d1c03392b (diff) | |
parent | 482997c56384d4af1b8f09761fad406e357ae3a3 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7a33282392 -s ours am: 482997c563 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12134821
Change-Id: I39064843f3807759d4e384cec936cec7eee5815c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions