diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-12 15:35:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-12 15:35:40 +0000 |
| commit | fa53c6abc4fc5469d413466c125a952cec4730d2 (patch) | |
| tree | 38a179826e87a9053155f6d5e8bc2f4ef10cedbd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c13f070eb0ae6bed5dd60dbf8a05d785bdaf726b (diff) | |
| parent | d0e083174cb7abdccb2060239c9c84e99f131b9f (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77e3cce083 -s ours am: e9fe9225e3 -s ours" into rvc-d1-dev-plus-aosp am: 7dcf503836 -s ours am: d0e083174c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12136585
Change-Id: Ied14ec379f4710051019332698a3a82e7a4adaba
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions