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