diff options
author | Bill Yi <byi@google.com> | 2019-09-10 09:13:46 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-10 09:13:46 -0700 |
commit | 8de7a1b8887a00e797db8739cb93622eeab5ff4b (patch) | |
tree | 1e9046c5bb3e20a1b80eb7b750f47509ba28f26c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8690600c2308f86be8a2f02569866b4e9ffbba28 (diff) | |
parent | c7bc6811eef53ad27a6abb0332c7b34b08062ca6 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: c7bc6811ee -s ours
am skip reason: subject contains skip directive
Change-Id: I49ce26d7bc30b12a978b7ce61928eb40a531aa49
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions