tree 5606f238f87c12745594f8ded920d1b1ecf10956
parent 6d0e585056492c83e83e6730d7246c1c052ea5e9
author Vishnu Nair <vishnun@google.com> 1604969169 +0000
committer Xin Li <delphij@google.com> 1606985334 +0000

resolve merge conflicts of I791fa82b54ddd7b2bca26f05409ec830187416c3 to rvc-d1-dev-plus-aosp
Bug: 172866897

Merged-In: I2b46b9bcde9d27d94aaa1917987d6a77dd1ff47d
Change-Id: I19229154233e2b7e35236e16386023cd78ecc854
(cherry picked from commit c69f30165892ca95dd796f71255c980e5051fdf0)