diff options
author | Bill Yi <byi@google.com> | 2017-07-26 18:47:26 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-26 18:47:26 +0000 |
commit | 60ebd52445896f13a417f67b0d9e3b3118470373 (patch) | |
tree | 8c8c1a5da9aa24101015a9625f2ab8f590b7668d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 0608857af59663c7aad99545fdaf17f44de67925 (diff) | |
parent | b978569fcec89111b571fbcf4e0442cbdbba0561 (diff) |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: b978569fce -s ours
Change-Id: I4f5887b8444b16dab976ba9cb9383f68bc2a9f59
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions