tree 4d511a5a008e377ee057c96a17769bd4bc5a972c
parent 75175b60505af6f317a484502122cd3e98afa988
parent 796cd4747ae23d86eee55d7cb3e59de42ca4d9a0
author Xin Li <delphij@google.com> 1606897020 -0800
committer Xin Li <delphij@google.com> 1606897020 -0800

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

Bug: 172690556
Merged-In: I22cc7bb8ac579d0e03f92ec5a16e8c0f2c768051
Change-Id: Ide85f5a8acd02dead55dc87f9d6a80b3261027b4