diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:49:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:49:52 +0000 |
| commit | 82f2b4335404c527c5e27c0283d81efac6bb24b5 (patch) | |
| tree | 86d487a4b3628a3f6095fbe2b1a477d05de371db /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d2a5c2470119f63ec4d5e72348dd5d991399042e (diff) | |
| parent | 14712d06a2f9eccddeef7155507f6edfe87996cc (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dffcd5fe7a -s ours am: be8cba0fac -s ours am: bb15668b5f -s ours" into rvc-qpr-dev-plus-aosp am: 14712d06a2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11961575
Change-Id: I479dbd2340c490681f54981079cf67d6e4bcf529
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions