tree 3a5b26e145f6189bd77e7bf27090cad9404ff208
parent 20653c1b1484f90f17494d16db23b72242da2e1b
parent 7076954bab9fb3e340c1b3e67f0e5935eb693238
author Xin Li <delphij@google.com> 1567990211 -0700
committer android-build-merger <android-build-merger@google.com> 1567990211 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: d3bf821fcb -s ours am: d8ec6eae57 -s ours
am: 7076954bab -s ours
am skip reason: change_id I2bdaf1520b9e5ad8a4a8ed2f5b0bf3d8c33f083f with SHA1 31458c02ad is in history

Change-Id: I45ed518dcc94a1fb37bbf1bc2bf19d4d72d31c61