diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-19 15:47:25 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 15:47:25 +0000 |
commit | 2e02718c35f68332148f49e1f4c2ff95274cdd9b (patch) | |
tree | 7f69384acaac3e5b33676fa3a0f5529b3a041e80 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | fcf2e4370f63bb1409722ab057d252d691db07bf (diff) | |
parent | 5812adbecd90bd506e137669a2b435934568774f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: d3f766ee0f -s ours am: b94d0f3187 -s ours am: 03c3e1af8c -s ours am: 5812adbecd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12187676
Change-Id: I3a5ff6b6edc1375e45a10f82ab7d50391dc1823a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions