tree 6b3fe9c4233d07aebb04f622d9b5b6341386bb1f
parent 6003f24f06bb4557685ab66ab439a2bfaad4fad2
parent b2b97cdd41d9c9d4eb7ea6963bfd7ea66c7a7bb2
author Xin Li <delphij@google.com> 1568236008 -0700
committer android-build-merger <android-build-merger@google.com> 1568236008 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: b2b97cdd41 -s ours
am skip reason: change_id I9e7e8d1457be3542cc00b9f9ce5a8a1500fb36c1 with SHA1 9dc8c8ebea is in history

Change-Id: Ib910fa5cf4965c460c003636296d4fc8a8246d84