tree ad9f2b5e710b4ec95013729f68f76d95dac92564
parent ceebbe9be491e1a1e6ca488a776a41f8f265efcb
parent a971fa1071af1f8bb620376d14887572140c998c
author Xin Li <delphij@google.com> 1567971844 -0700
committer Xin Li <delphij@google.com> 1567971844 -0700

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

No content change.

Bug: 135460123
Change-Id: I7e2a14706c47a800b6b6091086275e53b26e4765
Merged-In: I59e30906fce4dad6970787cdbe400ab8c56d6bbf