diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-10 17:53:52 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-10 17:53:52 +0000 |
commit | eae5ad7c4eb419010c09080314cfc1b4b3a2537c (patch) | |
tree | a2a3664d272b28dd4b2b5a0e2a51ad0ed34a61f0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 326e3ca1fc18194715d53d5c173ae677fa255bf4 (diff) | |
parent | 7dfc3e52d00f37bccf5a66d0587a19eddbea662d (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 473433fced -s ours am: 7dfc3e52d0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12340771
Change-Id: I0b1401e835f85fe9fb9dd3c09f97b68c2cf37952
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions