tree 93ee7914ec3901d2c53345d514b5f1597a1e6ba4
parent 230f3cbe4a22259f3eaaa6158b415a26c036d446
parent 66e4cbb73caf37a298f10d50470f4d26486bc99c
author Xin Li <delphij@google.com> 1606180864 -0800
committer Xin Li <delphij@google.com> 1606180864 -0800

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

Bug: 172690556
Merged-In: I0c15180497ffa67182a82adafe2f1002a567932c
Change-Id: I15ef78d59f6e20092969a08045b1e461788a1e92