tree 735c0afd86fd219a9a5add9b4643851b12826b83
parent 75338fd4ab4160265613906fddaf5908a480251c
parent b3ab1189d25fe196734ed7a2020d97e2aaebac39
author Xin Li <delphij@google.com> 1606180434 -0800
committer Xin Li <delphij@google.com> 1606180434 -0800

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

Bug: 172690556
Merged-In: I56abeae5adec79a1c7bdad1a261f0f62c055cf2e
Change-Id: I2efd8b65312e25c5c96bf36b3c4a655baffe2eaa