Jim Miller e11fbc08a3 am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev ...

* commit '33a5c80773b7b2913c92fec170787499a453d184':
  Revert "Disable fingerprint when remotely reset by DPM"

2015-08-18 20:15:10 +00:00

..

res

Import translations. DO NOT MERGE

2015-08-17 06:52:31 -07:00

scripts

…

src/com/android/keyguard

resolved conflicts for merge of 448216e7 to mnc-dr-dev

2015-08-18 13:07:25 -07:00

test

Allow dismissing Keyguard from TrustAgentService

2015-04-17 01:12:30 +00:00

Android.mk

Change carrier text to 'airplane mode' when on

2015-04-01 11:49:54 -04:00

AndroidManifest.xml

Add fingerprint settings support to the framework

2015-02-27 12:03:32 -08:00

NOTICE

…

proguard.flags

…