diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 18:13:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 18:13:56 +0000 |
| commit | 9717484c3b4141bc79f0d1fccea49074e2fae64f (patch) | |
| tree | 7511cb76547dc92aae1fd14628d883d9b13e803c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | af9e6f7d50d3ffa066babf2769359fa38e489f0b (diff) | |
| parent | b9d48e037962e3d083a070fd2103a0fdb5acdcf4 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 2063d3cd70 -s ours am: bf3033fdc2 -s ours" into rvc-qpr-dev-plus-aosp am: b9d48e0379 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11980782
Change-Id: I74c42bcdd7a0d1244c35178648ae25ab28b84fa9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions