tree 51a73adbaf99e2a1e9ab7641f45a6660fec24f6c
parent 21060593e332680ea41c30734298cf9eeeed5fba
parent 0797faf4f421677805fc00071ece47493e3e9e80
author Xin Li <delphij@google.com> 1567979192 -0700
committer android-build-merger <android-build-merger@google.com> 1567979192 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 0797faf4f4 -s ours
am skip reason: change_id I705adb517bc5cdd70c4f45fa627a274e4503dd2c with SHA1 1d5ca59dfc is in history

Change-Id: I8076691828974020bde8f3e3d591f36c0b572891