tree 6a8e781a0c8f62c783da869da3a4ed7719ce738c
parent b69aa3f39f6b3e83a8b49f8c00861aadc6801fb8
parent 487d9e6e241ba23c74a5177f04dab340ccae0a56
author Xin Li <delphij@google.com> 1598548587 -0700
committer Xin Li <delphij@google.com> 1598548587 -0700

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

Bug: 166295507
Merged-In: I49c82ad516931b8a7c90dc446a5df5e6ee52e56f
Change-Id: I609894770235673dc005d118062b9f8b4af08ba8