Elliott Hughes 6a885ba4a0 am ccec5f0d: resolved conflicts for merge of 02e85744 to master ...

* commit 'ccec5f0def723baa6c4c80bd7ff1971a32c9d8c3':
  Use the suggested public API instead of libcore.os.

2014-04-25 16:08:43 +00:00

..

res

Import translations. DO NOT MERGE

2014-04-23 11:21:37 -07:00

scripts

…

src/com/android/keyguard

resolved conflicts for merge of 02e85744 to master

2014-04-24 17:18:10 -07:00

test

Switch framework Holo references to Quantum.Light

2014-04-01 14:57:39 -07:00

Android.mk

Make Keyguard a library and make StatusBar the new Keyguard.

2014-03-28 22:35:03 +01:00

AndroidManifest.xml

Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'"

2014-04-14 17:54:22 +00:00

NOTICE

…

proguard.flags

Fix alpha animation bug in keyguard

2013-06-20 18:41:07 -07:00