diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-05 22:19:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 22:19:26 +0000 |
| commit | 8bc0d593334b337b3f1be21d965fd15a8eed820c (patch) | |
| tree | e1fd5c9113c23e3dfe3dd13a402374634a65a958 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c6c45b14224f562b14ef3766289e71200587e6d7 (diff) | |
| parent | deae5e78e0c54477af65e8bad26760bb28b3166c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 49f19dd01c -s ours am: deae5e78e0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13169558
Change-Id: Ib5db5e9f1f24c5a43c87a02658b49ea2225e14ed
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions