diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 09:14:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 09:14:03 +0000 |
| commit | 49d6cd84c46acace39157d2b5b45aaab86f457db (patch) | |
| tree | feb4b9596ead498ecdb2dc1bfde5f29a7937e7b0 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | f56508711e43dd3791d1827eb42d631a235898a1 (diff) | |
| parent | f78aa704531a09513fc0bf1f4898ffeab2e9c7d9 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 65997ef7b3 -s ours am: 3d121d3920 -s ours am: cf3a5fb7b7 -s ours am: f78aa70453 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079859
Change-Id: I63ee7cf017e7f527433bbcbce9ebe2119e5e018b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions