diff options
| author | Bill Yi <byi@google.com> | 2019-08-11 22:05:47 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-11 22:05:47 -0700 |
| commit | d9b32e4fc5804262d35770091071ecfd43385774 (patch) | |
| tree | 8136bc280952e76c61b3b11a0d92e4867f36b693 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 466299aea6c20023406464b70d12c2f8ebf8f6a3 (diff) | |
| parent | 8b5ab1e3756eef623c5cbddb093d82a164f5bf36 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours am: a6e7345636 -s ours am: e8b96c4515 -s ours
am: 8b5ab1e375 -s ours
am skip reason: subject contains skip directive
Change-Id: Id032698a563e64a45ed3ba1d29cd829c7882425e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions