tree 597e7ce3d3be910795c06ff32418232ab8a4b6d2
parent e14f4b1214d492b971bf5b56a04bbb7f21a6b715
parent 52bf171bec5ee513171d19fcace8de3e114e1b22
author Xin Li <delphij@google.com> 1606166091 -0800
committer Xin Li <delphij@google.com> 1606166091 -0800

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

Bug: 172690556
Merged-In: Icfc855bf9993c0e639e6484aa31d174e6b702c4c
Change-Id: Idddda38e3277fe33216d1de782bcfe43cebc5bfb