OSDN Git Service

am 42d669a6: (-s ours) am 92debeec: am f36bad31: (-s ours) am 0210adda: (-s ours...
authorStephen Hines <srhines@google.com>
Sat, 22 Feb 2014 00:51:48 +0000 (00:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 22 Feb 2014 00:51:48 +0000 (00:51 +0000)
* commit '42d669a668c10ffff0cf40d824eeac70b39d84e9':


Trivial merge