tree 46486d665dd16510e4fff9b4c42b1713bdf9244a
parent c6cc587801a6c70796809842c1970a374fc22883
parent 500413f16cb947ebb94d1463bf6815af29c3f73a
author Xin Li <delphij@google.com> 1598548640 -0700
committer Xin Li <delphij@google.com> 1598548640 -0700

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

Bug: 166295507
Merged-In: I517fdf14eab1f2be3f84e7b97c6d057f4bbf4bda
Change-Id: I5d7809cf7ab2c26f22ad34434bfd997baed6e327