OSDN Git Service

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


Trivial merge