diff options
author | Bill Yi <byi@google.com> | 2021-01-20 17:12:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-20 17:12:58 +0000 |
commit | d6f7ca2dbe7f497966a793a412a6aea362bd08e4 (patch) | |
tree | 5500031783e99a2bb25e4f93f4860b8180bd27e1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 36df85a2ac798b049a19107a4d21b3c39a106360 (diff) | |
parent | f42c175377536177bbc7eb39445e6be78168ce02 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f42c175377 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13375593
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3658be86ea4c28a6d23427cacd056792c3f21b06
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions