diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-21 20:25:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-21 20:25:50 +0000 |
| commit | f05b1658cc67a54fe5242487701425b36d5f8f60 (patch) | |
| tree | 0ca29050c695c71f21b0ba3146bb36958d7ae713 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a5bbeaca720f257273b511290cf9fa0faf076089 (diff) | |
| parent | 6b317fe8cf4b72a6d63f30978c7754be8a6fb64a (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 8bf888c7e9 -s ours am: 26cf70ebd3 -s ours" into rvc-qpr-dev-plus-aosp am: 6b317fe8cf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12198207
Change-Id: Id7518f9cccddd66267e673fc2f78f4dd9ed63500
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions