diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-19 15:16:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 15:16:01 +0000 |
commit | cdf6d64f0a81f1fd40c05b2d33df4fe57e84ee02 (patch) | |
tree | e2cf66d8dc19db5ab5cf491ea56c8962a598201f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 37a870f64b627e2fcc8620186c72a38c81100343 (diff) | |
parent | 75f9d330db8c5a2e3f82a666cb836bae00c681a9 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: f6d4adeef4 -s ours am: 75f9d330db -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12187283
Change-Id: I9798482cc45f703e4a4fd9e79373ffe31216c844
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions