Commits
Craig Mautner authored and Android Git Automerger committed c70f15fe298M
am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev * commit '2fc798a2270cda98366776af489d45c1043e831d': Fix FLAG_DISMISS_KEYGUARD not working
Showing diff to2fc798a2270