tree 809aa77cb2a239b3ae74b3099efbbfbdba641994
parent 66aae99b3dace54afae1bc2f7fc1a78a712a1188
parent 3fe5adf3adcdf4a78b859a1ce8eff07e804ce0c6
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: I829eb4215ea9aa15adf66e8bbdb37ec88a9bb6a4
Change-Id: I2e739d3606ba9f0938ebc2363cb9443ec3dec912