diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:53:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:53:25 +0000 |
| commit | 6a8dc9bc644375f39c2ca0c53a3051cabbbbd969 (patch) | |
| tree | b5d9df6968d259c499fe2a907f44a20a61d873e5 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 91ac54de77f278a470504a869527bde4f5607382 (diff) | |
| parent | bfb339a09827231dc2150ef038d8d81bc81e4ff3 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 1cdb57b79a -s ours am: cce78f1da7 -s ours am: d5ee9d3d5f -s ours am: 2d130de097 -s ours am: bfb339a098 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086566
Change-Id: I19c6b91da0e8f43098a3058382db2ef1998881ac
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions