tree fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98
parent c7d03309f91751191311d42c805ba24d30674242
parent 7fc6e3f8ff2e16ff91126ab6d74d7362a774fde7
author Xin Li <delphij@google.com> 1567982972 -0700
committer android-build-merger <android-build-merger@google.com> 1567982972 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 09dc9b073f -s ours
am: 7fc6e3f8ff -s ours
am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1 a209adb315 is in history

Change-Id: I67e58e13c18499f1fdcd5b6b72b8afce257a22f7