OSDN Git Service

Merge "resolve merge conflicts of 9795ff6 to master"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 22 Sep 2016 22:49:34 +0000 (22:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 22 Sep 2016 22:49:35 +0000 (22:49 +0000)

Trivial merge