OSDN Git Service

Merge "resolve merge conflicts of f53bfc9 to master"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 22 Jul 2016 06:59:58 +0000 (06:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 Jul 2016 06:59:59 +0000 (06:59 +0000)

Trivial merge