| commit | 5c12bc5851056f114893f3d381f9fc8785e2cdb0 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Tue Oct 30 18:04:31 2012 -0700 |
| committer | Ed Heyl <edheyl@google.com> | Tue Oct 30 18:04:31 2012 -0700 |
| tree | 17878b3d5f64c9de966c154fcabf0c86d5e98349 | |
| parent | 20329dcb37fffca1de3ded6b58341e87cc43c4a9 [diff] | |
| parent | a371e5315ea2f632c80b56e1f8665765414df980 [diff] |
Merge remote-tracking branch 'goog/jb-mr1-lockscreen-dev' into jb-mr1-dev