OSDN Git Service

Merge "resolve merge conflicts of cf85fd5 to stage-aosp-master" into stage-aosp-master
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 15 Jul 2016 23:51:04 +0000 (23:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 15 Jul 2016 23:51:05 +0000 (23:51 +0000)

Trivial merge