diff options
author | Bill Yi <byi@google.com> | 2016-07-06 04:30:47 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-06 04:30:47 +0000 |
commit | 4f174386a67ca02aee866737a1de47e6e5dee00d (patch) | |
tree | 51a9ac30c3459ea134c3fc53bd5b8f667d5d0f31 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d20b0ad358672781fcc3acda329e2275cce2f1ba (diff) | |
parent | 0a4315194df1b42818a9f43bd5145813bf59a1d9 (diff) |
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 0a4315194d -s ours
Change-Id: I5fec32a2824d652c96c7c2b9bb0db46c170bffa9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions