tree c24789830230557c3d8098501a0941cc5fe9e69d
parent ba5c5cf9606bca4e8f192b3f0de45ff7e2912e56
parent 23442489fbd55fcf76efa90d264d74677eda07a6
author Xin Li <delphij@google.com> 1598548588 -0700
committer Xin Li <delphij@google.com> 1598548588 -0700

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

Bug: 166295507
Merged-In: I69a69f0bd988eedd220f8aaab9932e871fe8a2c0
Change-Id: I32a7ca28f66d8350a9a1bebe88d5aa7481a4ce0b