diff options
| author | Bill Yi <byi@google.com> | 2019-06-28 14:39:18 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-28 14:39:18 -0700 |
| commit | 8fa925d05a7c0f8e56343befbf941be052b8a762 (patch) | |
| tree | 62bb6006ae3f21b737ad065514bfb51da4d59528 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 4341a6089b1cd59a4431f74990c3dc9903085423 (diff) | |
| parent | 33cc35006392ab98a5e9678995da2ff4b3f677c0 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 33cc350063 -s ours
am skip reason: subject contains skip directive
Change-Id: I2d64c387c481c37033496ef86fa9aa17fe78b53e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions