tree d4f3ea771bc05b25781aa37708576bdc207ea4b7
parent c7e0fc92e23857a1c6a9eede34fef8faf4069c27
parent e8e680005ded182b01baa52042503c067d79b2c3
author Xin Li <delphij@google.com> 1598645473 -0700
committer Xin Li <delphij@google.com> 1598645473 -0700

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

Bug: 166295507
Merged-In: I88f54d5cf388aeacbf1da48e3e5f1e89f37ba836
Change-Id: I2e4012ae6bf1cf4e5e5cb76790cd2451e313febc