diff options
author | Bill Yi <byi@google.com> | 2019-06-01 08:05:27 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-01 08:05:27 -0700 |
commit | 33ab3773509b756847306921b154df6d51fc644c (patch) | |
tree | fefbadbf9f76394b92c3ec6d372aa4183a2b6894 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d9380319197a14be039150e95cca1df2fadf2d4e (diff) | |
parent | a2b17defcec2ba068a5e814cc5361656b4af5381 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d6d42f4be1 -s ours
am: a2b17defce -s ours
am skip reason: subject contains skip directive
Change-Id: Ic5103f34ff298a62fe94b79324af827e32a07ac1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions