tree 4174a82bfca04983dccfed1647661f4fe30814d9
parent ec2bbed55dc7e4f98d2f9a7eb2b1b93276a5da7b
parent 3f563648be6df71eb7fa629e91c31995a38322c1
author Xin Li <delphij@google.com> 1606179930 -0800
committer Xin Li <delphij@google.com> 1606179930 -0800

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

Bug: 172690556
Merged-In: I527097ba19414c3ed99606f95276ff506cfb4ec2
Change-Id: If031ceec4c449b2dd5a7f6516fa5faa3d880b144