tree 161a121cc2729fc71e04e8f1e87e9c3b292f7bbe
parent d26f6e7941d7205aefae9865a65eec54d16f18aa
parent 4f497175b4675b1cc39ac01f9ece3cb0094ab7ec
author Xin Li <delphij@google.com> 1567971828 -0700
committer Xin Li <delphij@google.com> 1567971828 -0700

Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

No content change.

Bug: 135460123
Change-Id: I796b11d51ecde1ec1b1b439bc14c9aec5eaf4e5c
Merged-In: I960e9c58447f384c429b4234cc298946c87a6e55