diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 07:03:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 07:03:08 +0000 |
| commit | 0e91b2e558fe066b1e0d087cf866118a7b296435 (patch) | |
| tree | ac790e097d5d1c43ab2ff44f09a5fa48748c6c51 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | eb467b5323cc524484f87e80a72c7e4535afccbd (diff) | |
| parent | cd7e79c65520ce2fb1d3cee3c51c0c04ef0a9159 (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d3135ecb -s ours am: 8a673b874f -s ours am: ac342cc50c -s ours" into rvc-qpr-dev-plus-aosp am: cd7e79c655 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12184422
Change-Id: I40ec2997b595507ff86561eac1e34ac0a3085c69
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions