tree 808ec2a0acb239a02c24904e977766fafd9023da
parent ca77fb97d2f18998cc1a6875165b8ada6d697800
parent fc8c47718e1ddf7b4e3bcda964687bd494342bfa
author Xin Li <delphij@google.com> 1598548591 -0700
committer Xin Li <delphij@google.com> 1598548591 -0700

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

Bug: 166295507
Merged-In: I27c2ede56c89e9145b6f1a5cdd349fe37d3a229b
Change-Id: Ia4f3ce3113c6199975c391de8fbcf828cca63f13