commit | 676a5419d7cd73695ce22fe0c6d8666dc9c4e234 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Aug 15 18:46:19 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 15 18:46:19 2019 -0700 |
tree | 46ac3a32431ab785442dfaf69019e70b21b7009c | |
parent | b54ea33ee563da9c7d2adde9046edba879921d75 [diff] | |
parent | ab6a1df7672a92070d3873e113bead67b9ac89a7 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master am: d528d7e695 -s ours am: 946ea70adb am: 58887211df am: ab6a1df767 -s ours am skip reason: subject contains skip directive Change-Id: Ifc5e9d31c34cc120f610a367ef3dceb7622cc760