summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-04-17 18:19:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-17 18:19:51 +0000
commitae1248452a0db7fb389bba935a6605098edb2761 (patch)
tree68b1fa00ef9cef6d9a936410b92310e554100046 /packages/Keyguard
parent1a2a6b474c9b8cf08e4e4f7194602af5063d5cce (diff)
parentf805b40c44769a751d10d404e8ea778a23d5a51a (diff)
downloadframeworks_base-ae1248452a0db7fb389bba935a6605098edb2761.zip
frameworks_base-ae1248452a0db7fb389bba935a6605098edb2761.tar.gz
frameworks_base-ae1248452a0db7fb389bba935a6605098edb2761.tar.bz2
am f805b40c: Merge changes Ia2bf4d17,I8242523d
* commit 'f805b40c44769a751d10d404e8ea778a23d5a51a': Fix alert dialog alignment and touch feedback masking Fix VectorDrawable states
Diffstat (limited to 'packages/Keyguard')
0 files changed, 0 insertions, 0 deletions