tree 518c22fa20c590cdeca7d792502980a26a2999fc
parent 086548fbc889c7f469e1ddec6f2d1f905252521a
parent 77f2daee76218cb14aacb508b0e215ee8af6e711
author Xin Li <delphij@google.com> 1606165994 -0800
committer Xin Li <delphij@google.com> 1606165994 -0800

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

Bug: 172690556
Merged-In: If16d8d5acdf8434f63f5ffd399a1452d358462b9
Change-Id: I7285667a1affabae23875858a457f09113c1481c