tree 0d7a277001158b2a1ae2fb2390d390427064b9fb
parent b4bbbb5dac4ddb7d329c39ea2d43fcd97aff71fc
parent 12ba0849c67253abce22aae8dcb3049b2ae244b5
author Xin Li <delphij@google.com> 1606897570 -0800
committer Xin Li <delphij@google.com> 1606897570 -0800

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

Bug: 172690556
Merged-In: I3c472c1178a6c68f524785a5362524ede1d7a158
Change-Id: I831ca4a17b75e84674d2cf7443d6e3f4d64c59c4