diff options
author | Jim Miller <jaggies@google.com> | 2014-11-21 18:53:10 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2014-11-21 18:53:10 +0000 |
commit | eab3240c78423e791a7f36864f55f94c25a5aba5 (patch) | |
tree | 77c4fee38747b6e8c024ce47f2047587263e67f3 /core/java/android/widget/CheckedTextView.java | |
parent | 0108d9836971d9f40bf7856d1858ecc4b153e511 (diff) | |
parent | 0284e5e49864a6e039d77210bbea0a013b0e23ec (diff) | |
download | frameworks_base-eab3240c78423e791a7f36864f55f94c25a5aba5.zip frameworks_base-eab3240c78423e791a7f36864f55f94c25a5aba5.tar.gz frameworks_base-eab3240c78423e791a7f36864f55f94c25a5aba5.tar.bz2 |
Merge "Add multi-sim support to keyguard" into lmp-mr1-dev
automerge: 0284e5e
* commit '0284e5e49864a6e039d77210bbea0a013b0e23ec':
Add multi-sim support to keyguard
Diffstat (limited to 'core/java/android/widget/CheckedTextView.java')
0 files changed, 0 insertions, 0 deletions