tree 2250d0ca95b1f4d9737844a407824a5914a4296f
parent c5f102295523ec3fe3d1581ddce9e15ff6e8eed1
parent 11b00da8ebfb62cb0ef8cc2627af9ab468e7d540
author Xin Li <delphij@google.com> 1567981757 -0700
committer android-build-merger <android-build-merger@google.com> 1567981757 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 639e0bdf4f -s ours
am: 11b00da8eb -s ours
am skip reason: change_id I12c299b18f26a6135dc8573693318679f443b5df with SHA1 78bc12304a is in history

Change-Id: I8ce39a4d889c0025ebf715f77b77a5dc7f9b94d1