diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 23:02:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 23:02:24 +0000 |
| commit | a4efcb75903e0bcb39242d972e35d8710bfdb85f (patch) | |
| tree | 8e0287ad692af4ce3614dd190617e2e6c23efc9e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b982e4aedfd74077ea64603ffeb40d685dc79399 (diff) | |
| parent | db4be448a4da46a5ef190c8aa3932ea6b186ae69 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f670a4a50b -s ours am: fcb4b21373 -s ours" into rvc-qpr-dev-plus-aosp am: db4be448a4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11809313
Change-Id: I648ce417929cccb6eb6b9e533ea5638b72b49a18
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions