tree d4a2bb93af78b429b7689047bae9416521911cdd
parent 96ee6315db826c4a84e6f280abcfd60e2a4ee389
parent 6f0afa2b615f8aa1cfcb7a9d49059561bbbb0ee1
author Xin Li <delphij@google.com> 1606166051 -0800
committer Xin Li <delphij@google.com> 1606166051 -0800

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

Bug: 172690556
Merged-In: Ib7af1dc437feb7676e2c9ebe81075bc9e93f0eb9
Change-Id: I1325e88711b3e467279ebcc168ddb20525b0388a