diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-20 20:28:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-20 20:28:41 +0000 |
| commit | 8d2894831dd2b77c5c197d75f97864a887853e06 (patch) | |
| tree | e36c6ce46208c3ce37e12327dd1f2b8a4f338e49 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | feea4f580bdaa51cbfdf10684fea5a33fb1183eb (diff) | |
| parent | 82cac19b47565b04fd04e503dd74407cf6ea1f0a (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2cbc87a9bf -s ours am: 82cac19b47 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534099
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia1799a1817d9b2b0729c4219f651f5b9b8d55d6b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions