OSDN Git Service

Merge "resolve merge conflicts of 2c826d7 to master"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 27 Sep 2016 18:46:15 +0000 (18:46 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 27 Sep 2016 18:46:16 +0000 (18:46 +0000)

Trivial merge