| commit | 7cc0a1f1bb1113771f7eb405e697d0867c8bc25e | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Nov 21 22:32:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 21 22:32:40 2014 +0000 |
| tree | 5dafc9b501c114c607a4ef2f051dbb478633d786 | |
| parent | 6bcf223bf64cd4895e3fe948080475075ff7b80d [diff] | |
| parent | 879a4ee8b09e879de890dbbbc34629cd297572eb [diff] |
am 879a4ee8: Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e automerge: eab3240 * commit '879a4ee8b09e879de890dbbbc34629cd297572eb': Add multi-sim support to keyguard