Adrian Roos e57818a20e Merge "Allow dismissing Keyguard from TrustAgentService"

2015-04-17 02:44:09 +00:00

..

java/com/android/server

Merge "Allow dismissing Keyguard from TrustAgentService"

2015-04-17 02:44:09 +00:00

jni

Merge "Check correct NO_ERROR response from Keystore"

2015-04-15 20:49:38 +00:00

Android.mk

resolved conflicts for merge of 962a11ad to master

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