diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 15:28:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 15:28:24 +0000 |
| commit | 61cbe6cc40f26833237ce487336b41ae8688a026 (patch) | |
| tree | fd5212ce314d91f45f8ffd5305800846e871e936 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 26fd2e1ba1dc85e680bebed54d8dc7bc8abb2f87 (diff) | |
| parent | 3f99ca4f24583c8c7a74665e9f2539b08f5b21f9 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: f6d4adeef4 -s ours am: 75f9d330db -s ours" into rvc-d1-dev-plus-aosp am: 3f99ca4f24 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12187283
Change-Id: Ia2bdb9d7db342ec58d05355f8e8030bb13deded7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions