OSDN Git Service

Merge "resolve merge conflicts of 6800033 to master"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 17 Jun 2016 20:32:43 +0000 (20:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 17 Jun 2016 20:32:44 +0000 (20:32 +0000)

Trivial merge