am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev

* commit '5c12bc5851056f114893f3d381f9fc8785e2cdb0':
This commit is contained in:
Ed Heyl
2012-10-30 18:07:39 -07:00
committed by Android Git Automerger

Diff Content Not Available