diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 19:28:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 19:28:32 +0000 |
commit | a4c785ac3d3147dd5535fb6513a9c8c34c4936b5 (patch) | |
tree | 2f87279041d3182ad9cf4a9ff176e284e8cc68a8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | fddf7cf52f6778c8090810d11beb1ec7a709d301 (diff) | |
parent | c42930e1cf95fdcd6d7188bdf3daf83ff73f3222 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 06ba19ff4e -s ours am: c42930e1cf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11972643
Change-Id: Ib85f792ece1167c2811a79a7f2166c5d7efbdba5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions