tree 2939b610e453fb7a21774f749f7012c29622e940
parent 98487c8d2545bfce94feedcfb0873d42b0e04ea3
parent 868acf3ead65f5a9e3c568639296f8b4d5a10bd8
author Xin Li <delphij@google.com> 1567984969 -0700
committer android-build-merger <android-build-merger@google.com> 1567984969 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 2ddd0fcff0 -s ours
am: 868acf3ead -s ours
am skip reason: change_id I3d98bd70a659cad37d520fb0e7ecd631f622e8fb with SHA1 e56141599a is in history

Change-Id: Idec32f127ab8f7c2fd3a56cd25769a771364471c