OSDN Git Service

Merge "resolve merge conflicts of cdbdd46 to master"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 12 Aug 2016 17:22:02 +0000 (17:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 12 Aug 2016 17:22:03 +0000 (17:22 +0000)

Trivial merge