tree 17a1199ee2ea78089071a7d4e218d12e20d1abde
parent b44da56f63c155e214313b06f7d82d917d3b7cca
parent 7646625c85fce0195c5ad71302c09bffa6e2cc7a
author Xin Li <delphij@google.com> 1598548587 -0700
committer Xin Li <delphij@google.com> 1598548587 -0700

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

Bug: 166295507
Merged-In: I2fd77533987528dafbbcd5e01c9b44a424f70ddf
Change-Id: I00a0930452a689304126c64ce8dd6ed837ff9b74