tree c42a90aacfe1c07af564ada7ea03e559767ab543
parent 048a25a0e6680624b09f4e5d4a2b7ebf9003d1ab
parent 31f98139fef9bf73dd272e9f4eebf04deae68f4b
author Xin Li <delphij@google.com> 1567971899 -0700
committer Xin Li <delphij@google.com> 1567971899 -0700

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

No content change.

Bug: 135460123
Change-Id: Ief8a32d432db5dfc932e373edc2946f541512baf
Merged-In: I97bbdae04e76ce32de0c25ed580b95ef2ec9a5ee