tree 26e86e09f8578261b3ba6b8ca0631d6e58cbf4e8
parent d809f306aa11a44185be481dda450688048a6adf
parent c2510cab636153aca0fbd5959108bb7468b4e231
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: I62dd37dbbe959f869225f57dda0504fd31546e53
Change-Id: I9cd544292abc85430a234bede371e4f4010848b6