diff options
author | Bill Yi <byi@google.com> | 2016-06-20 19:06:53 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 19:06:53 +0000 |
commit | ddc101ee512bbc8aec55cf77afecce7f4c338b40 (patch) | |
tree | 1563a5e360307767976e0ae17fe44c0f746b5f74 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 72ea5eeb61ef625aefa42ad97a31e8138ad3c8bd (diff) | |
parent | a69a9bdc1fad6abd3b1eac5e08214ebc6a4de5b0 (diff) |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: a69a9bdc1f -s ours
Change-Id: I70cf8182d8a81cedbeab7c81f293bb7ed0f9dab7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions