diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-02 18:09:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 18:09:41 +0000 |
| commit | 16a06649db77c9346db207252262db51112f445d (patch) | |
| tree | 5db9ae1906438971c6992ef795850542ab8ef969 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0da905a2bb7011b404d8fe89442ab6a015bb7c74 (diff) | |
| parent | f812c75948c3b2d177be3d7e6c87e8ff9bdaed34 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 051a24c592 -s ours am: 921f98c788 -s ours am: 81c0905c57 -s ours am: f812c75948 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508633
Change-Id: Ida06d2d15c00484fd3f2e6ce5a126e1aa1af10e5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions