diff options
author | Bill Yi <byi@google.com> | 2016-11-21 01:55:04 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-11-21 01:55:04 +0000 |
commit | a1a953be7e70a2213f0b25dd0f26d58c9f97088f (patch) | |
tree | 2406fe8280cf92fb931fa11c7e69e351249326c5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 3956a928a7ea8014210455c26e45b500fe3f8fe5 (diff) | |
parent | 9a82f273a8ea99c15720a3275d746cdc1b65c181 (diff) |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0b555bb27d -s ours
am: 9a82f273a8 -s ours
Change-Id: I97035ae01ff66cfd98251e5c93fd3c9f271b24d8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions