OSDN Git Service

am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb...
authorEd Heyl <edheyl@google.com>
Wed, 31 Oct 2012 01:07:39 +0000 (18:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Oct 2012 01:07:39 +0000 (18:07 -0700)
* commit '5c12bc5851056f114893f3d381f9fc8785e2cdb0':


Trivial merge