tree 994917bfe4c52a7ef203b8e4269402670aeef5fc
parent 7ab40c993f398a44b20a39cfb739faeff7b22433
parent 44f759e325835c96bce9d672ce5449b9e600a65b
author Xin Li <delphij@google.com> 1567984047 -0700
committer android-build-merger <android-build-merger@google.com> 1567984047 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 3ee74659ab -s ours am: 95c3139bbe -s ours
am: 44f759e325 -s ours
am skip reason: change_id I9c84a0c1f8be7e5e24702cfafb773b3bbf97ceb3 with SHA1 607711c60d is in history

Change-Id: I7af34669aa1f8b64e6978ad5499c12c8b1835068