diff options
author | Bill Yi <byi@google.com> | 2017-08-30 19:50:09 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-30 19:50:09 +0000 |
commit | 3ea5aa121b040d77d674ffa2983216686b91d046 (patch) | |
tree | 2e2d6d56129aabac849b523fb03108bd4f2dec67 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8ab5f7f324af9228dcf6b2406a50cafd9a40b1f7 (diff) | |
parent | 7604fe28e815b9230c5ebd3a1c6e4e29df5c5783 (diff) |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 7604fe28e8 -s ours
Change-Id: I570d19568b3dcb3bc0c8da42232f1de18a197972
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions