diff options
author | Bill Yi <byi@google.com> | 2017-07-01 17:22:15 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-01 17:22:15 +0000 |
commit | bec1ac92028b8288d6791b4f908acdd242ab37d2 (patch) | |
tree | 3377f20ca6fcfc2b5c2faee383b0cfe86099d247 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | a940b9943254e76ac0f861ad9e9e2eed814c4384 (diff) | |
parent | a873d02f0e7a55426f349202d70ecb552eb4ef2a (diff) |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: c393596c5c -s ours am: 0e0b89a3e9 -s ours" into oc-dr1-dev-plus-aosp
am: a873d02f0e -s ours
Change-Id: Ib635a50ada0a482c62cd22a661a5d16960808d28
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions