diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 23:48:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 23:48:21 +0000 |
| commit | a2ff340699741edbe3d1c0c1b020d3648071f9a0 (patch) | |
| tree | 8ec08525b1cce5c6ff6c7cc0ab31e75de2e68ef5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 39a7d96384a54949c4907bad1bd17fe9cd1a13c6 (diff) | |
| parent | 67d840035be7d7d4f9f8f8e75aac6335138f1ccd (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51ae4ade4d -s ours am: 06d1b3a584 -s ours" into rvc-d1-dev-plus-aosp am: fb7b1afab0 -s ours am: 67d840035b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11758285
Change-Id: I4343124c60515e12fd5089bdcdc82f329d637714
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions