OSDN Git Service

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


Trivial merge