tree ea4eeed4c0683dc7fa4aea8d169a104a84c3ae0a
parent 0a21d89f37dc44404b9c6f1e9f6eb97641c71a8a
parent ac7a814e03cd0b96a80bf91b5190988ca9664f87
author Xin Li <delphij@google.com> 1598548663 -0700
committer Xin Li <delphij@google.com> 1598548663 -0700

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

Bug: 166295507
Merged-In: Iaecb67ed1eeb890b29ac4e6f2808a6f9dff001c8
Change-Id: Ie7a92abe3ba5e8ed52e268bc8ee6e2464663a975