diff options
| author | Baligh Uddin <baligh@google.com> | 2019-06-02 06:43:57 -0700 |
|---|---|---|
| committer | Baligh Uddin <baligh@google.com> | 2019-06-02 06:43:57 -0700 |
| commit | 0beb862ba074ca3c03f36b6dcf11694a1c69fb18 (patch) | |
| tree | 0f916ebde5ee115108d41711709a3979e8f3ff8d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f26f7053797e47f6f2040f1370608487b1b966b8 (diff) | |
| parent | aef843f97038df818be789ae3b7fa671920c2fa0 (diff) | |
resolve merge conflicts of aef843f97038df818be789ae3b7fa671920c2fa0 to qt-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
BUG: 133225687
Change-Id: I9efff587a1984db9d1907c0dde2444f58c1410e1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions