OSDN Git Service

Merge "resolve merge conflicts of b90e2c85c06f to master"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 11 Aug 2017 03:04:02 +0000 (03:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Aug 2017 03:04:02 +0000 (03:04 +0000)

Trivial merge