tree 5debfad1f461e3bd12ab19f1546286f916e8ed37
parent d61d8067f956a08f0a3623de20fc2f35dcd5dcbf
parent 4031654387e6a659f891d3a5b4c14a225ecb334a
author Xin Li <delphij@google.com> 1567983660 -0700
committer android-build-merger <android-build-merger@google.com> 1567983660 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 57f4cfa833 -s ours
am: 4031654387 -s ours
am skip reason: change_id I3d73bf43d8985be0683859900ce9ffec0eb7a27f with SHA1 c32eb4ca72 is in history

Change-Id: I5f8ce2d2fd173b80d52ee70a11c6932698aaafdc