diff options
| author | Bill Yi <byi@google.com> | 2019-08-04 02:42:34 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-04 02:42:34 -0700 |
| commit | 50424fa0fbddf5087b4c24e817fe10b528ff573f (patch) | |
| tree | 4a5dcd3fc8e9b956388f0b73a507649439ab87e5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c7cecc38336a8d02fc8ad61befafda42a24acdf3 (diff) | |
| parent | 292d4c31e54d9d926f3ae7bbaf9f9420cbecba76 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab6ef4f0df -s ours am: 6a4598d617 -s ours am: 07814412e6 -s ours
am: 292d4c31e5 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic876e516c46b3edb0253aaca5059e9212f6497b7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions