tree a158d5197323d9626d3183166c1b83929f142502
parent 09a0f57f873fe85c5795f3f6660df594aafeacf7
parent 6232225d8b81ad8b192f462fd910096959adc749
author Xin Li <delphij@google.com> 1598934098 -0700
committer Xin Li <delphij@google.com> 1598934098 -0700

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

Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2