Olawale Ogunwale 5b9b66c73c Merge "Should reset mDismissKeyguard on keyguard secure change" into mnc-dev

2015-06-02 17:51:22 +00:00

..

java/com/android/server

Merge "Should reset mDismissKeyguard on keyguard secure change" into mnc-dev

2015-06-02 17:51:22 +00:00

jni

Allow INADDR_NONE as a valid configuration in AGpsStatus_v3.

2015-05-29 13:49:20 -07:00

Android.mk

resolved conflicts for merge of 962a11ad to master

2015-03-31 11:15:39 +01:00