summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2013-10-29 08:54:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-29 08:54:15 -0700
commit07873e3a72da254bcdf965f6fa76bdcc800ef511 (patch)
treea249f803ca9c8dd5cc1bb8c918b4c792fec0dc3c /packages/Keyguard
parent3a855ba5225ac6b3f85397713178a7b85069057a (diff)
parent569220399841ae1a3fd62a1b77fa087bca2ee0f3 (diff)
downloadframeworks_base-07873e3a72da254bcdf965f6fa76bdcc800ef511.zip
frameworks_base-07873e3a72da254bcdf965f6fa76bdcc800ef511.tar.gz
frameworks_base-07873e3a72da254bcdf965f6fa76bdcc800ef511.tar.bz2
am 56922039: am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."
* commit '569220399841ae1a3fd62a1b77fa087bca2ee0f3': Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
Diffstat (limited to 'packages/Keyguard')
0 files changed, 0 insertions, 0 deletions