diff options
author | Baligh Uddin <baligh@google.com> | 2016-06-08 13:22:09 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 13:22:09 +0000 |
commit | ee384436c11ad84cdff1a9806b0da29782cee129 (patch) | |
tree | ca1470972233cd82ad567d8b1f7dd3ec2e2b82d3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 064464251f990f4f97e445c3a13b5bf800eb0c7f (diff) | |
parent | 002ccec5c104e1c7b86fbfc3af8fd9b26342ce56 (diff) |
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 002ccec5c1 -s ours
Change-Id: I52be9c2c3a2a242c1b3bbea371248e210782b32a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions