diff options
author | Bill Yi <byi@google.com> | 2019-06-04 18:22:55 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-04 18:22:55 -0700 |
commit | fb900c8432cf0ecd6f222a224e8dd9d4194133b5 (patch) | |
tree | 1eb15d1f0278705adc62516ab3add9fab61f9e88 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d1f08c582a89821a84599c9db848f168e7ec58ac (diff) | |
parent | 452be4963cd9c10007b9c05364ebf6745fb86e7c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 452be4963c -s ours
am skip reason: subject contains skip directive
Change-Id: I6c1d62458eb5d1aad5a02877bb4dbc1bf7239bf9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions