diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 18:09:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:09:58 +0000 |
commit | 0b8f7b268bbdfbeb570c0982243ae56abb4f1d78 (patch) | |
tree | 5c9a79eccf75bf4114202965af78e891dd5f0b00 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 83c57b1d16de90fb0cfea2d5a07066784102b910 (diff) | |
parent | f80182d13639a00dfdd7944de3eca6cc6eb21874 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dffcd5fe7a -s ours am: f80182d136 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11961575
Change-Id: I2f27e07221593cb49c6398f2be99cccd01897b4f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions