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