Jeff Brown 682ed6b608 Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev

2014-11-21 21:48:47 +00:00

..

java/com/android/server

Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev

2014-11-21 21:48:47 +00:00

jni

Show error dialogs over apps that dismiss keyguard

2014-11-11 16:22:56 -08:00

Android.mk

…