OSDN Git Service

am f36bad31: (-s ours) am 0210adda: (-s ours) am d79086a1: (-s ours) am 3acb57db...
authorStephen Hines <srhines@google.com>
Mon, 10 Mar 2014 18:04:51 +0000 (18:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 Mar 2014 18:04:51 +0000 (18:04 +0000)
* commit 'f36bad3128edafb52dfbc21b6d344e89f3f75fba':


Trivial merge