diff options
author | John Spurlock <jspurlock@google.com> | 2013-04-16 13:23:47 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-16 13:23:47 +0000 |
commit | 5584737fff6350ab09fb53e6a73bbff770930727 (patch) | |
tree | a3f1eefce34749a626f43e34bb7878ade63f4e0b /nfc-extras | |
parent | 83d90b200babe43d5e91cef1bbcf0b224f48e16d (diff) | |
parent | 3733c4c2fec9f69d48a13a82d5bade3926248efa (diff) | |
download | frameworks_base-5584737fff6350ab09fb53e6a73bbff770930727.zip frameworks_base-5584737fff6350ab09fb53e6a73bbff770930727.tar.gz frameworks_base-5584737fff6350ab09fb53e6a73bbff770930727.tar.bz2 |
Merge "FLAG_DISMISS_KEYGUARD should not hide status bar if secure." into jb-mr2-dev
Diffstat (limited to 'nfc-extras')
0 files changed, 0 insertions, 0 deletions