diff options
| author | Xin Li <delphij@google.com> | 2019-11-24 00:04:21 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-24 00:04:21 -0800 |
| commit | dfb66cca2209f2074e17a98de28e96b6de4e8f29 (patch) | |
| tree | c8aa5a7f824ffdaaa6d12811dacf786e65dad964 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 698f511333e895862c51bf8030b1669b788495a4 (diff) | |
| parent | 4623c35f07ce98660725418ef53eb3d5e3d33fba (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Merge QQ1A.191205.011 into stage-aosp-master" into stage-aosp-master
am: 4623c35f07 -s ours
am skip reason: change_id I86c741f7ede242568aab436f673000c9f0da5813 with SHA1 b52dfe672f is in history
Change-Id: I5e240ea7d65e7a4b239e73b16903c267b090450e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions