tree 15421faf5c7b9194cc887ca4f063b3bad9d44226
parent d07a060f8a4dbe1fef55b831c821992f3049753c
parent 192858f513c696636b5e90eb93d3994622a0ee23
author Xin Li <delphij@google.com> 1567979554 -0700
committer android-build-merger <android-build-merger@google.com> 1567979554 -0700

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

Change-Id: I365c4bcf2031828d0349ad4b10c5e40fce92ffdc