Narayan Kamath 1d184acefa resolved conflicts for merge of 7377998d to lmp-mr1-dev ...

Change-Id: I21870e241de7d992e97d7b91e0058f85b5a25fbe

2014-11-27 09:57:35 +00:00

..

java/com/android/server

resolved conflicts for merge of 7377998d to lmp-mr1-dev

2014-11-27 09:57:35 +00:00

jni

Show error dialogs over apps that dismiss keyguard

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

Android.mk

…