tree e2b1f63a66dd501d88c62619ad7ad082cc730504
parent 45595d475387d432adf90052106e38ce86fa2e54
parent 3b09f24d1dd0cb9545a7d04d96035fc70439e516
author Xin Li <delphij@google.com> 1598548611 -0700
committer Xin Li <delphij@google.com> 1598548611 -0700

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

Bug: 166295507
Merged-In: Ic08b97c9660daee8bd69db381ea55234d37a0106
Change-Id: Ib83cd87683ae896de789cdf6cd0c801562a191d5