tree c36bdc1bb46d0a04443ad7fa1e07eb1de8f266b2
parent 86797e809e136c0609bf0879ed9a0f360daf584f
parent 0d256aefb8707ede44d19990c18e3238acec09c5
author Xin Li <delphij@google.com> 1598548661 -0700
committer Xin Li <delphij@google.com> 1598548661 -0700

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

Bug: 166295507
Merged-In: Ia304ff142efc0a4550772f5cea25ef55b781542d
Change-Id: I3c6248f1992b2d2eb1df18f1af5f75a68f8dbc16