| commit | 879a4ee8b09e879de890dbbbc34629cd297572eb | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Nov 21 18:55:36 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 21 18:55:36 2014 +0000 |
| tree | 4c42ddf9dc3c8f7ab71df447c72929f254cb914d | |
| parent | 7d13d9db1ef90063cb542ccd6554042a6a3263b7 [diff] | |
| parent | eab3240c78423e791a7f36864f55f94c25a5aba5 [diff] |
Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e automerge: eab3240 * commit 'eab3240c78423e791a7f36864f55f94c25a5aba5': Add multi-sim support to keyguard