diff options
| author | Bill Yi <byi@google.com> | 2017-07-22 17:28:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-22 17:28:22 +0000 |
| commit | 68ff051e5de73062d38696f62e47543e6e988d53 (patch) | |
| tree | c39bbee8debf15cb55f82acc82d6fb156ed03581 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 4a1b101ecc6d0296d6e059884110f4f31f475fb9 (diff) | |
| parent | e6eba20c1519e710b9e029f6392d30cdb4ecda83 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae -s ours am: 85de7f20ab -s ours" into oc-mr1-dev-plus-aosp
am: e6eba20c15 -s ours
Change-Id: I459f59c35e70c0bbbb00a6a12c14204afc5af499
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions