diff options
author | Bill Yi <byi@google.com> | 2016-06-16 10:08:55 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-16 10:08:55 +0000 |
commit | 7c00e15378cb370c2052be0d9fe5b66ec17c7dc0 (patch) | |
tree | f600a700a723368b495094007267a629368cef8f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 206ac49f44c34fc42fa0e76ef5a9ef0c7f6e215e (diff) | |
parent | f924f2130f0763ba68fd17292be904cda392e2ec (diff) |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b99d2 -s ours
am: f924f2130f -s ours
Change-Id: Ie9b5a6e2814d4e7f7b7146c677aeed6932c5b11c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions