Craig Mautner ffb22827d7 am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev ...

* commit '2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6':
  Fix FLAG_DISMISS_KEYGUARD not working

2014-04-01 21:56:55 +00:00

..

src/com/android/internal/policy/impl

am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev

2014-04-01 21:56:55 +00:00

Android.mk

…