Wale Ogunwale 89b3ecc7b3 resolve merge conflicts of 2755644 to lmp-mr1-ub-dev. ...

Change-Id: I01920b0dc8185d8efb9431bfad911e4733b43e1d

2014-11-12 12:46:45 -08:00

..

java/com/android/server

resolve merge conflicts of 2755644 to lmp-mr1-ub-dev.

2014-11-12 12:46:45 -08:00

jni

Show error dialogs over apps that dismiss keyguard

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

Android.mk

…