Commits


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