diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-14 06:16:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-14 06:16:06 +0000 |
commit | 1d759eb842af0da5e0c97d4092e4d31f634629c9 (patch) | |
tree | a9e0e5c34fc13bdb78058927ec24249545b8a06a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 3dca381bac588d485e984606d5aec4728572a88c (diff) | |
parent | c681fec4cabb3321cfb1fa7aacfb65e8a4611e96 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 96860e0ecc -s ours am: 40e01bebc0 -s ours am: 1f7c212e10 -s ours am: c681fec4ca -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11860341
Change-Id: I18c3da5264bc2c84e2d348a78a66fc11ce6604c8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions