tree a3f1eefce34749a626f43e34bb7878ade63f4e0b
parent 83d90b200babe43d5e91cef1bbcf0b224f48e16d
parent 3733c4c2fec9f69d48a13a82d5bade3926248efa
author John Spurlock <jspurlock@google.com> 1366118627 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366118627 +0000

Merge "FLAG_DISMISS_KEYGUARD should not hide status bar if secure." into jb-mr2-dev