diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-29 07:00:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-29 07:00:16 +0000 |
| commit | deb450ac8eb7f06c669b9ee1f1a7a2106a4389c1 (patch) | |
| tree | f930ee39e0650f90ae9fc52894982f5f5c17fb5e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 99c88a160f76e966a318dc2fec527c93b290b909 (diff) | |
| parent | 8a86026b48839bfc648967f8d876827c91fc45a7 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4d7d9c5fce -s ours" into rvc-qpr-dev-plus-aosp am: 8a86026b48 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14011966
Change-Id: I732ad844fc7b47ed0700ee23a88800b709dbd7cf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions