summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorSteven Ross <stross@google.com>2012-10-16 17:47:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-16 17:47:23 -0700
commit9dff9125074bfd1a4ead4ba995fd830b9a121263 (patch)
tree7b502e775a7512eb510b6d7537da454005653b43 /api
parentf0bba8a8d0ace06f786bc0d78b0ed3ea3ae59814 (diff)
parente4728b15cba1cebb8d9f60d146d95ff58a945ad8 (diff)
downloadframeworks_base-9dff9125074bfd1a4ead4ba995fd830b9a121263.zip
frameworks_base-9dff9125074bfd1a4ead4ba995fd830b9a121263.tar.gz
frameworks_base-9dff9125074bfd1a4ead4ba995fd830b9a121263.tar.bz2
am e4728b15: Merge "Stopping Face Unlock immediately on detaching from window fixes 7338808" into jb-mr1-dev
* commit 'e4728b15cba1cebb8d9f60d146d95ff58a945ad8': Stopping Face Unlock immediately on detaching from window fixes 7338808
Diffstat (limited to 'api')
0 files changed, 0 insertions, 0 deletions