diff options
| author | Bill Yi <byi@google.com> | 2019-06-24 09:16:17 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 09:16:17 -0700 |
| commit | 549fd86271cff6b27f5d82bf789977f10a7b276a (patch) | |
| tree | 327813f3031b344a0b2c9348147e04e45434625e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 712ffbb92de5806a0ed51e4d641b84e392186694 (diff) | |
| parent | 49377c15f06f0dd12e5a2fe31b8887c667ec243f (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: cc13f9ed66 -s ours am: 4c20c8c114 -s ours
am: 49377c15f0 -s ours
am skip reason: subject contains skip directive
Change-Id: I25482f70f8c596f7df1ee4f69e3153e0dc7799f9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions