diff options
author | Bill Yi <byi@google.com> | 2017-08-05 13:36:11 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-05 13:36:11 +0000 |
commit | 7de684a02c45448db8e9f9452f7509b0f9b84550 (patch) | |
tree | 609289e0a8cbf405524d2d469322e29a82fed6b8 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | b07294b9eb50af7cbcd2ea732d542bf53709516c (diff) | |
parent | f9e03da0b954c9abaf9c95f118963cce7b5056a9 (diff) |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: f9e03da0b9 -s ours
Change-Id: Ibfc11d3ad1c6a5892ada761cab957f65467e511c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions