tree 6187795acaeb16c87c1cfe143d8794ebfee53347
parent ab03c338396122ca1c3f8387688e8d0a7809acd4
parent 02b8581591c85976c02fddca1a6c2efaea3aec9e
author Xin Li <delphij@google.com> 1606166078 -0800
committer Xin Li <delphij@google.com> 1606166078 -0800

Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

Bug: 172690556
Merged-In: Ib6b72ef12bfc7ab458c82e55c0acaf130a92c722
Change-Id: Ic862688d4a92b2100fc53f16e67dacf99226ce24