diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:35:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:35:49 +0000 |
| commit | 77c19165282c0ea873d19656c1e4dbae853fcba8 (patch) | |
| tree | 14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1187edbbf9e12d8283a6413353864746fc899542 (diff) | |
| parent | 16df259b0a8d817874aea1a4afc9d9afa212edcc (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9f7daa495f -s ours am: 69c10a41ac -s ours am: a44b9c4c08 -s ours" into rvc-d1-dev-plus-aosp am: 16df259b0a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086501
Change-Id: I45147edecd628051f5e9fe709649d0e9359aa19b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions