tree a82f01125a48acb7ef6fc97f04c4ea87638970c7
parent 2eefe984dfea89e8ee92e1c2efbf2b1ed7254e96
parent 464817144362e51f5f9d1e480f78436071c457e9
author Xin Li <delphij@google.com> 1598548599 -0700
committer Xin Li <delphij@google.com> 1598548599 -0700

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

Bug: 166295507
Merged-In: Iaf32fd4a6c83aeb7f50755af16559afa7b60fefc
Change-Id: I5f6aefff19c46967dc9e2f677828030dc137b7ce