tree fb816460c25340390ec0f757e89b7b7753e58599
parent 3018c2dacf02ddee15a0d0780b73758c31a9d050
parent d194f32a26e11700b7f47cf67d41d0c7d5cf1340
author Xin Li <delphij@google.com> 1606166062 -0800
committer Xin Li <delphij@google.com> 1606166062 -0800

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

Bug: 172690556
Merged-In: I2fed8c65faefcd0d1eff7f829e2d23bf20035b51
Change-Id: I709657f2c365a07311485adde9306d4a9508be00