OSDN Git Service

Merge "resolve merge conflicts of 66a8895 to master"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 19 Sep 2016 21:24:32 +0000 (21:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 19 Sep 2016 21:24:33 +0000 (21:24 +0000)

Trivial merge