diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-22 14:57:07 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-22 14:57:07 +0000 |
commit | 2ecde77f5496c9a050246295e120d3a91d5afcef (patch) | |
tree | 28634386a64fcc8f1ee6cc4efcfdef2139ec86b3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2d70d0c94fe8b14633711f681f3acc5d39f433df (diff) | |
parent | 20cac86b405fb9ba96e9970d72bcaf1318c8cadf (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 0468f27105 -s ours am: 20cac86b40 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12427864
Change-Id: If49fcc130dedcc4b4f7b21716ca7212ad71d5c75
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions