diff options
author | Brian Colonna <bcolonna@google.com> | 2013-04-15 14:27:40 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-15 14:27:40 -0700 |
commit | 647e4b82fea7e566b7173a9398150f1e26f5834f (patch) | |
tree | 32b5ae8ca3bb2af5f3b75c80af8141965dda3728 /libs | |
parent | 18197ec438ea57b2b0bc2847e7f6d903137f9e8c (diff) | |
parent | df6db6adc2fd09da77a028539e802e69d0a8d6a1 (diff) | |
download | frameworks_base-647e4b82fea7e566b7173a9398150f1e26f5834f.zip frameworks_base-647e4b82fea7e566b7173a9398150f1e26f5834f.tar.gz frameworks_base-647e4b82fea7e566b7173a9398150f1e26f5834f.tar.bz2 |
am df6db6ad: am 3f1375e5: Merge "Enabling Face Unlock for user switching (bug 8495282)" into jb-mr2-dev
* commit 'df6db6adc2fd09da77a028539e802e69d0a8d6a1':
Enabling Face Unlock for user switching (bug 8495282)
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions