OSDN Git Service

Merge "resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage...
authorNeil Fuller <nfuller@google.com>
Fri, 23 Aug 2019 08:48:14 +0000 (08:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 23 Aug 2019 08:48:14 +0000 (08:48 +0000)

Trivial merge