commit | 203ab466d7471eafe81492ddb541ee9a131771ef | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Sep 11 15:02:35 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 15:02:35 2019 -0700 |
tree | 7fb5a322927a862efde77948b6f94382850688c9 | |
parent | caeeec6490519a1530bc9d673b036b56f8bd9352 [diff] | |
parent | 5ccd3e3c3961f3b9ccdb481591c37a2ee3818ba0 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 69a1fd86d3 -s ours am: 5ccd3e3c39 -s ours am skip reason: change_id I24f07ba89ba6e6dac8adc2a6bb654d75d2b73d3e with SHA1 e3b772e0f7 is in history Change-Id: I5113813143261cd2779447fe8f30c8c30d0167a3