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