OSDN Git Service

Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e
authorJim Miller <jaggies@google.com>
Fri, 21 Nov 2014 18:55:36 +0000 (18:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Nov 2014 18:55:36 +0000 (18:55 +0000)
commit879a4ee8b09e879de890dbbbc34629cd297572eb
tree4c42ddf9dc3c8f7ab71df447c72929f254cb914d
parent7d13d9db1ef90063cb542ccd6554042a6a3263b7
parenteab3240c78423e791a7f36864f55f94c25a5aba5
Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e
automerge: eab3240

* commit 'eab3240c78423e791a7f36864f55f94c25a5aba5':
  Add multi-sim support to keyguard