diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-13 17:01:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-13 17:01:00 +0000 |
| commit | 27d7036612270cd97f391c2555bc76a2e2013799 (patch) | |
| tree | 949d3b83d38b8e7890aa86d9bee78766689334eb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 332ac458068a34522c9a8273ef9a0fa9bd4d1bcb (diff) | |
| parent | 902477724aec8268d73b1f3dbf257f2a2fe2d86b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0f57ff1fe7 -s ours am: 902477724a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14172938
Change-Id: I10f827cfa822b6d8e5f98c102fbcbb67b2695740
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions