OSDN Git Service

DO NOT MERGE - Merge Android 10 into master
authorXin Li <delphij@google.com>
Wed, 4 Sep 2019 20:35:31 +0000 (13:35 -0700)
committerXin Li <delphij@google.com>
Wed, 4 Sep 2019 20:35:31 +0000 (13:35 -0700)
Bug: 139893257
Change-Id: I9dc8417f0d87c87eac13437834e69a52c1887258


Trivial merge