Evan Charlton 8c6d9e544e resolved conflicts for merge of 352e1082 to master-nova ...

Change-Id: I6ab96bcc801d8c264908c89d465a9a7f49e1ef16

2014-04-14 11:53:39 -07:00

..

res

resolved conflicts for merge of 352e1082 to master-nova

2014-04-14 11:53:39 -07:00

src/com/android/systemui

Fix incoming phone calls on lockscreen.

2014-04-11 21:13:28 +00:00

tests

…

Android.mk

…

AndroidManifest.xml

Set a dark theme for SystemUI.

2014-04-11 01:36:33 +02:00

lint.xml

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

…