diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-01 03:41:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-01 03:41:59 +0000 |
| commit | 420890de46cba72ae950b5aece44d92857f4814d (patch) | |
| tree | aaf2abe38ba08ef23f69b085ca9f53756d24faf8 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | ce03babc79b7bd84c62441305c747c728fa8b7b5 (diff) | |
| parent | cc1418a1e036d3ddfd83d07a9b26ebbf27ca964f (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: a812182b2c -s ours am: cc1418a1e0 -s ours
am skip reason: subject contains skip directive
Change-Id: I1df48489296f155791c9146546be5d68fff46e95
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions