diff options
author | Bill Yi <byi@google.com> | 2017-08-24 17:03:10 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-24 17:03:10 +0000 |
commit | ecf3da31242fdf9d794b89f526a13f31ebcdf75c (patch) | |
tree | 7092bbe0f822a96f5fc9868e568c24025f254375 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1ade98c41420ca91911531ef8384cd2ed8d0fb71 (diff) | |
parent | 0497f43e807a9052da9b70a415be30ea10c3cb98 (diff) |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7175b7b929 -s ours am: 1c1e7095f3 -s ours" into oc-mr1-dev-plus-aosp
am: 0497f43e80 -s ours
Change-Id: I7bb12539e6be02e39a8b57e293f872cf47432ce1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions