diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 07:24:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 07:24:53 +0000 |
| commit | 5ee3da92bb90e338e3c95d2e1ac7ce91e8b9fed5 (patch) | |
| tree | 3a87da8c1b0e6643b38554e2577301a6b992995b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ecc7743bfff8b943b198c83c5b206a2f610b6cf7 (diff) | |
| parent | b27b355bfad55755ae7fdef69f649e4525bbca2f (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f7cc355649 -s ours am: 3a46197ad8 -s ours am: 307fb22f2d -s ours am: b27b355bfa -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12516156
Change-Id: I741a32f0571e54eb83d4d046439d04830bcf06de
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions