Jim Miller d273cae2c4 resolved conflicts for merge of fb2e3c8d to master ...

Change-Id: Ic9fe2674e0eb82d071f9b547b6089acacf705576

2013-10-01 15:42:45 -07:00

..

res

Merge "Import translations. DO NOT MERGE"

2013-10-01 02:44:05 +00:00

src/com/android/systemui

resolved conflicts for merge of fb2e3c8d to master

2013-10-01 15:42:45 -07:00

tests

…

Android.mk

Remove unused services module dependency from sysui.

2013-06-25 15:09:36 -04:00

AndroidManifest.xml

Would you like a dessert?

2013-09-26 15:51:45 -04:00

lint.xml

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

Keep PhoneStatusBar default constructor around.

2013-09-23 11:15:11 -04:00