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