diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 05:59:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 05:59:33 +0000 |
| commit | ce6558e396eac8b1037e4c7584b3539df81bf35d (patch) | |
| tree | 8b7a11f8999c326cb3bb687e46fb4c502abe2460 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5c941c30572c71fc5e83389c2661291cb8b93956 (diff) | |
| parent | 7c1c75ddcac625af3184fc51afb7d061f350d355 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f32cba8606 -s ours am: c93a4a583b -s ours" into rvc-qpr-dev-plus-aosp am: 7c1c75ddca -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11988455
Change-Id: I6cf8e3ef5c03ded2d26c1459db45dcb35adf1f27
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions