Jeff Brown 46bfd4a355 resolved conflicts for merge of c608e106 to master ...

Change-Id: I49117966f43080d86763bab51848dbc50e55ecf8

2011-01-30 12:50:09 -08:00

..

assets/fonts

Notification & settings panel redesign.

2011-01-19 16:41:48 -05:00

res

resolved conflicts for merge of c608e106 to master

2011-01-30 12:50:09 -08:00

src/com/android/systemui

Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb

2011-01-30 12:07:49 -08:00

Android.mk

Fix proguard flag file dependency.

2010-09-30 13:20:45 -07:00

AndroidManifest.xml

Simplify panel animations with an eye to performance.

2011-01-11 14:47:26 -05:00

MODULE_LICENSE_APACHE2

Move the StatusBarPhone package into a new catch-all SystemUI.apk.

2010-06-02 14:48:45 -07:00

NOTICE

Move the StatusBarPhone package into a new catch-all SystemUI.apk.

2010-06-02 14:48:45 -07:00

proguard.flags

Lights out.

2010-09-02 12:29:26 -04:00