diff options
author | Bill Yi <byi@google.com> | 2019-06-21 15:30:33 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-21 15:30:33 -0700 |
commit | fa90167dcb838fc2e22c2f1827bb3486617a390d (patch) | |
tree | 1a9a61ee4dce54209a04b9ebdcd0ae0e09a74dbe /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8f0c3ac7c6d5cd6d980d425390eb1d5f4dcf1d80 (diff) | |
parent | af16a228a29407515d99a2e4cddc37ab0269af76 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 019e1bf3fb -s ours
am: af16a228a2 -s ours
am skip reason: subject contains skip directive
Change-Id: I1035374267cf948c63d087a82a46efd68f870e59
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions