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