tree a3da86e55128f906818c00b9c2efcfa78dd049e9
parent b646c8721fc60df3abe7a49c726a1f2ac223a3e6
parent 309f7e5467591ea3cad13be7840f97c2f9c0d764
author Xin Li <delphij@google.com> 1568241637 -0700
committer android-build-merger <android-build-merger@google.com> 1568241637 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: cfaf477e54 -s ours am: f52a3a79cd -s ours
am: 309f7e5467 -s ours
am skip reason: change_id I971ea1db5b37fca8a651cba85ba12c44d13e07c1 with SHA1 979aed6d01 is in history

Change-Id: I984410f7a6070083bc7d29b33be1c7af9917227d