tree bfb3960f0e76abe9eb757037e777e824f9e7150c
parent ef6b231056bb1bdcea293429c939d6c4396714f0
parent 5c074eb45f6f6c9847128811688d98e0cd9de78f
author Xin Li <delphij@google.com> 1598548601 -0700
committer Xin Li <delphij@google.com> 1598548601 -0700

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

Bug: 166295507
Merged-In: I3ef9471c3daf6846f9e9ee56df2f57661d4ddb00
Change-Id: I1e02ed042efd096b4d664707cab17560adfa2de7