tree 168b34e98caa1900eab61a2be26a0aaf266bcf53
parent 46533bc15cc49be143176e6945caf20f2609d795
parent 0edb97b50720639fe8d7e7869376a03949048226
author Xin Li <delphij@google.com> 1606166061 -0800
committer Xin Li <delphij@google.com> 1606166061 -0800

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

Bug: 172690556
Merged-In: Ib951d1a8f55a514f77d015fec8c3cbc1809760d5
Change-Id: I47caff651827119801e9151b9a4954061f169553