diff options
author | Bill Yi <byi@google.com> | 2016-07-01 05:14:03 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-01 05:14:03 +0000 |
commit | d12eda72f8fdf0335b3da03dcb8d15f1e88028ed (patch) | |
tree | 718f9de5999d4d5756d3a5b698802fdd9b3909c8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 24b6f4efe1128b18e85361360244e0137a759f6e (diff) | |
parent | 845e214b5e51e1689e9fc8ca62524f39cfab59c7 (diff) |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 873e9e16ab -s ours
am: 845e214b5e -s ours
Change-Id: I22db15b89463c53ca2c60339221071b7ef4bc3dc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions