tree 6795f53bbf55736fbb50314dc904d7ffb2b063fa
parent b82ed64e09ef725b0c675f3fc30296c4844befae
parent 56462add52c101b18bd0a4eb4e89b3f1c6963681
author Xin Li <delphij@google.com> 1598548619 -0700
committer Xin Li <delphij@google.com> 1598548619 -0700

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

Bug: 166295507
Merged-In: I5a6abeeeab91e9f2ce7e6f49e863d76f21bd44d6
Change-Id: I5667593cf89e4432861a5033ea57281507ddce74