diff options
| author | Bill Yi <byi@google.com> | 2019-05-26 09:16:56 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-26 09:16:56 -0700 |
| commit | 1d010ab1fd88da01f998117f510c1ab169502423 (patch) | |
| tree | a1544ee44893b6beb1e4411395c5dbc5aeb5c335 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7a46c4eb0f201e2756dd14a9564a0768c3be1a2a (diff) | |
| parent | edc7e9b6e05b26531515ca3f9059610c4d2abb18 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: edc7e9b6e0 -s ours
am skip reason: subject contains skip directive
Change-Id: I2ac3ec76e4812cc487893e465f21bca7cdd3ef65
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions