tree 5e70eb4979c30f73dec4650c23c033b7576f3989
parent c41eb33923da4b12997126aefb79f581e95c806a
parent 3aa98472ec785b88f25b9cad2c020e8b871ce745
author Xin Li <delphij@google.com> 1606166072 -0800
committer Xin Li <delphij@google.com> 1606166072 -0800

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

Bug: 172690556
Merged-In: I3ded251721193e101437127b6ec9e6c141b7d3da
Change-Id: Iede8164e8b02f8136c10fdb53033d242d21723cb