tree 6b63a0c462516c8c7ad109d090ea5c5197101ccc
parent 66d866abdf7184af7a98edce18012fc33c41b623
parent 0506b68a4f23e7639c470b075fdf547347bad810
author Xin Li <delphij@google.com> 1598548621 -0700
committer Xin Li <delphij@google.com> 1598548621 -0700

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Bug: 166295507
Merged-In: I0270484ab34bb53a0d85951b0621e0c8b552b8be
Change-Id: I8a6a13dc1fdd09f3851cbdee0bbb4165247b3735