diff options
author | Bill Yi <byi@google.com> | 2016-06-24 06:02:43 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-24 06:02:43 +0000 |
commit | 6a24fea0833751a1320af39af9693ae026dc9367 (patch) | |
tree | f06837098ea0de2139c6ccb4a96463ded1595a08 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 0e7117ad0c8a1a64adb1484c625eca870988ef8b (diff) | |
parent | 7106fcc96b176b055b54f57e53d24dcd0517c8c6 (diff) |
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 2bc13bcdad -s ours am: b8f7854c9a -s ours
am: 7106fcc96b -s ours
Change-Id: I515c1cba8153bd0a6739192403ac1203b89d3f8e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions