| commit | 1f928787eebefedef944708f99515fabfcc4a201 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Tue Oct 30 18:07:39 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 30 18:07:39 2012 -0700 |
| tree | 17878b3d5f64c9de966c154fcabf0c86d5e98349 | |
| parent | d2f616f224b2731778c187dba4ecfa3a1a2e7869 [diff] | |
| parent | 5c12bc5851056f114893f3d381f9fc8785e2cdb0 [diff] |
am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev * commit '5c12bc5851056f114893f3d381f9fc8785e2cdb0':