tree 78e1c0c4baf33dd5c13f2de1c1a95541ca222dcf
parent f8e6f4ab295c05f7f884d0ba746ed6f40d14b987
parent 262f58369e95203ab3dc61bd853f0dd68353ef0d
author Xin Li <delphij@google.com> 1567982966 -0700
committer android-build-merger <android-build-merger@google.com> 1567982966 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 2b584b3c9b -s ours
am: 262f58369e -s ours
am skip reason: change_id Iaeb61121f5854bbbc7f762e131be1c1c27d14331 with SHA1 98318494cb is in history

Change-Id: I1ef03233ba8cc7975698739718579bf72fda80dc