tree c8575d03172cf21a872134b3f8146fcee13ef4ab
parent 2f27907a2770b508d3e04c76ddd41e2dd3b4af38
parent 4c81a5e7776b9c5e7a668678169522975ba07a6a
author Xin Li <delphij@google.com> 1598548604 -0700
committer Xin Li <delphij@google.com> 1598548604 -0700

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

Bug: 166295507
Merged-In: I84ebef54432ccd94172f01d5c20984fec0e6a480
Change-Id: I76c7b62b7500c6af1fcfca614958c0993d921528