tree a5c3e70d0c965d5b0cd9dc2e7a9f881fcd4ac971
parent ffc94b862a9cad7bc33d0eec8423465e0f13208c
parent d4ba83ca3ffd7665d57975c4ba9e1318b31be602
author Xin Li <delphij@google.com> 1567985832 -0700
committer android-build-merger <android-build-merger@google.com> 1567985832 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: ced3e81f4a -s ours
am: d4ba83ca3f -s ours
am skip reason: change_id Iade42e1a78a3f2fdd0fe86e274028138114ba6aa with SHA1 99c42afb19 is in history

Change-Id: I730df008d16c897e76a078ca2d744afbe34aa5cb