tree d5944152a727a06bac6b49c9b8442d046fc6d81e
parent 9449852ea9341327b34e90eaa4c265d06f72036e
parent a9b08390e9894d2410ad747b717bdc3b3f8d24bd
author Xin Li <delphij@google.com> 1567985094 -0700
committer android-build-merger <android-build-merger@google.com> 1567985094 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 98097fcd33 -s ours
am: a9b08390e9 -s ours
am skip reason: change_id I93262c0d8a623323eeec809cd25d60406b50e8df with SHA1 b03cd5de10 is in history

Change-Id: I5ee78fdd2c6808fe2f17ed5d9fe4877fc7cd4460