diff options
| author | Inseob Kim <inseob@google.com> | 2019-08-22 15:04:50 +0900 |
|---|---|---|
| committer | Inseob Kim <inseob@google.com> | 2019-08-22 07:26:54 +0000 |
| commit | f1ceee01665d605d376cb4e99b16c2c180990ddb (patch) | |
| tree | 66211f37298041455e858f00ec08003005568bc8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 729bac82ff35adb0dacc4d81c1b6490f6ed35a65 (diff) | |
| parent | 5a8c6d97a5ce3830f3bd7a8327753af390d3a477 (diff) | |
resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8217f0ad136df63f9861bdb3e18b9d0ae8812214
Merged-In: I6d69fb418bac675bbb9e4ac25c3269dfa3029219
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions