tree 28ce16b16a7e52db33e3f6e094e396893e0d2001
parent ccdd1f54465436a98fad4748a7c4010c92b26038
parent b0558dada3861646e385b12edeedbc6255380d66
author Xin Li <delphij@google.com> 1567984271 -0700
committer android-build-merger <android-build-merger@google.com> 1567984271 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 0f24028d66 -s ours am: e5c19ce0d5 -s ours
am: b0558dada3 -s ours
am skip reason: change_id Icca1852f77cb4cc70efa1f6ec95acfe013f8aac3 with SHA1 06df218bfc is in history

Change-Id: Ied1788eb26c63daaa1f061d706902e589c834b2f