tree fbfba66e46e8eb41ed5f18eee646b5cd72dd4583
parent 2de14c75a35077107b716956a8b61d1daf5012ba
parent accd557c7e26fcb91a1c64cbe5f41dfe2e05e475
author Xin Li <delphij@google.com> 1567984011 -0700
committer android-build-merger <android-build-merger@google.com> 1567984011 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: de1b4be0c4 -s ours am: 8081ebca4f -s ours
am: accd557c7e -s ours
am skip reason: change_id I67e45067cbd831b3a64e6a41b3553de9cbcbc192 with SHA1 a71181c20f is in history

Change-Id: I56cf957fba746f72e2d55095f8e92d5cb49f48e7