Robert Greenwalt c1b3cbe164 resolved conflicts for merge of ea54b760 to master ...

Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8

2011-11-09 09:03:59 -08:00

..

assets/fonts

Notification & settings panel redesign.

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

res

resolved conflicts for merge of ea54b760 to master

2011-11-09 09:03:59 -08:00

src/com/android/systemui

Merge "Wimax : wimax framework related open source." into ics-mr1

2011-11-08 10:01:07 -08:00

tests

Add functional test for screenshots.

2011-07-28 19:52:49 -07:00

Android.mk

Add functional test for screenshots.

2011-07-28 19:52:49 -07:00

AndroidManifest.xml

Offer the user an option to launch Dreams when docked.

2011-11-04 15:15:41 -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

Protect animation methods from Proguard.

2011-07-29 12:41:25 -04:00