OSDN Git Service

Merge "resolve merge conflicts of 352eac6 to master"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 14 Jul 2016 19:47:46 +0000 (19:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 14 Jul 2016 19:47:47 +0000 (19:47 +0000)

Trivial merge