OSDN Git Service

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


Trivial merge