commit | eab3240c78423e791a7f36864f55f94c25a5aba5 | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Fri Nov 21 18:53:10 2014 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Nov 21 18:53:10 2014 +0000 |
tree | 77c4fee38747b6e8c024ce47f2047587263e67f3 | |
parent | 0108d9836971d9f40bf7856d1858ecc4b153e511 [diff] | |
parent | 0284e5e49864a6e039d77210bbea0a013b0e23ec [diff] |
Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e * commit '0284e5e49864a6e039d77210bbea0a013b0e23ec': Add multi-sim support to keyguard