tree 0832b1592aa8200e0d8b30639bfea5813030a20d
parent 146f2401e125ccd537cd9abfd802a6c16a4c9418
parent ddcdd34e4ca7d8b3035423b2c740450325d3d15a
author Xin Li <delphij@google.com> 1568225797 -0700
committer android-build-merger <android-build-merger@google.com> 1568225797 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 854a8c6ee5 -s ours am: 729d7b0452 -s ours
am: ddcdd34e4c -s ours
am skip reason: change_id I33a774efca2e5b3fe6d25f1edec36f0794e4be79 with SHA1 a90d607403 is in history

Change-Id: I8434be3a68dbfa58a167409d4407a43c0ea8f826