Jeff Brown fb0448ab4b resolved conflicts for merge of 4f8cd188 to master ...

Change-Id: I148cd616cd14d834915978aa2dc3f9e27188dbd3

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

..

res

Layout notifications on top and introduce artifical margin

2014-04-30 15:25:56 +02:00

scripts

…

src/com/android/keyguard

resolved conflicts for merge of 4f8cd188 to master

2014-05-01 18:19:31 -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