diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-05 22:11:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 22:11:52 +0000 |
| commit | 694ad9678ad1408b8024fe88d601999dd316d7e5 (patch) | |
| tree | d3aae18ea1e1092585182efd404fb86d0cbda374 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 53179c98df49fabf049fb76460332f01723aa579 (diff) | |
| parent | 804946ff28ecd4782f7c699f27207550b22a9017 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 49c8207c66 -s ours am: 804946ff28 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13168467
Change-Id: Ic338e35cc0d74c1085a315714961434cf409ff38
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions