tree 245e84a93d19adff3ae726b6f9e01c9d03974ec6
parent a1fa2e64ad8a96e2299a90d31e17ac76f303baba
parent 1508d8834487fb116940c9131b00854c219e285b
author Xin Li <delphij@google.com> 1598639538 -0700
committer Xin Li <delphij@google.com> 1598639538 -0700

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

Bug: 166295507
Merged-In: Ia4252557017a3f7dc4e40a4e006994becdcfc77f
Change-Id: Iaf511a01e9a73da3d82251eae2ea49f39f78627d