Dianne Hackborn 678d344bcb resolved conflicts for merge of b9e2f68b to master ...

Change-Id: Icb68aee4c68170f0e7cd7854dbaa61656a349142

2011-06-03 14:15:10 -07:00

..

assets/fonts

Notification & settings panel redesign.

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

res

Merge "Import revised translations."

2011-06-03 10:22:58 -07:00

src/com/android/systemui

resolved conflicts for merge of b9e2f68b to master

2011-06-03 14:15:10 -07:00

Android.mk

Fix proguard flag file dependency.

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

AndroidManifest.xml

DO NOT MERGE: Backport more USB accessory changes from honeycomb

2011-03-15 16:50:18 -04: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