Jorim Jaggi dc4d3c37fd am a2e10038: Merge "Never close Keyguard automatically." ...

* commit 'a2e10038fce80323c86ac90dff8d5d7216cde00f':
  Never close Keyguard automatically.

2014-05-06 20:06:21 +00:00

..

res

am a2e10038: Merge "Never close Keyguard automatically."

2014-05-06 20:06:21 +00:00

scripts

…

src/com/android/keyguard

resolved conflicts for merge of 4f8cd188 to master

2014-05-01 18:19:31 -07:00

test

…

Android.mk

…

AndroidManifest.xml

…

NOTICE

…

proguard.flags

…