tree 5fdbb6b80416b59237b0885264b4f773a242b733
parent 5bb759468465b32333f0a98a239cfcc9063d3d08
parent 240cec7f3efaf77f9235e057d382806d0a04e907
author Xin Li <delphij@google.com> 1567985945 -0700
committer android-build-merger <android-build-merger@google.com> 1567985945 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 7c11befc89 -s ours
am: 240cec7f3e -s ours
am skip reason: change_id I859ac505f3b7d0ae307d42d902b7a1c8fd185f59 with SHA1 c3f5bfaf4c is in history

Change-Id: Ifd2c554aaa74b8e8f26747e2793c81aabfb4b04d