diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 21:09:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 21:09:45 +0000 |
| commit | 95a0d167c22878f8ec73e086b82f85991e9f8e8f (patch) | |
| tree | e323bf8c9844d259ec2af71ae7381b1bf5d9c397 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ed7c0cc764390733432e7eb6c030416923188c74 (diff) | |
| parent | 6875f4e5533e3ca1c22b7b9f7c2e1c1324fc36e7 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 14d8e24fef -s ours am: b8a30b14dc -s ours" into rvc-d1-dev-plus-aosp am: 6875f4e553 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818445
Change-Id: Iff60f18f38715139d97b3aa823922d98e5467e30
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions