diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-28 17:20:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-28 17:20:20 +0000 |
| commit | 3f06482d066569dea850929b2bd03e60ead8629d (patch) | |
| tree | 37d51c4f021433a0b6c0e003c30a6928d1793b1d /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 6fdcc66bd0b87b50a3c93104e506ff4e00a2ec9a (diff) | |
| parent | adfcc47d46e00221ec83ae1661b06ff15bc4b7c7 (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70441941ec -s ours am: da6291607c -s ours" into rvc-qpr-dev-plus-aosp am: adfcc47d46 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12242939
Change-Id: I61173c9961bd20f72735d4cf72e641c0b578dda2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions