OSDN Git Service

Merge "resolve merge conflicts of 1238daf to master"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 27 Oct 2016 02:50:23 +0000 (02:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 27 Oct 2016 02:50:25 +0000 (02:50 +0000)

Trivial merge