tree 44d33dc292fe604c7b379e0d7a98394de82e5cbf
parent 069704a519fa98f9f1be9736bce8d528bf72e7ff
parent be6f16a531ac30cc892bb3fabb84a6dcaf176e37
author Xin Li <delphij@google.com> 1598548603 -0700
committer Xin Li <delphij@google.com> 1598548603 -0700

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

Bug: 166295507
Merged-In: Ice8deea93919c5c2b33395f82592e44c88989b28
Change-Id: Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684