OSDN Git Service

DO NOT MERGE - Merge Android R QPR1
authorXin Li <delphij@google.com>
Thu, 10 Dec 2020 01:44:05 +0000 (17:44 -0800)
committerXin Li <delphij@google.com>
Thu, 10 Dec 2020 01:44:05 +0000 (17:44 -0800)
Bug: 172690556
Merged-In: Ibf87b4db0c49db9f489b2937bff9691258f71e16
Change-Id: Ied5bcebdcd24b61fd49e29f6b894b56b08909327


Trivial merge