Gilles Debunne ff3c191d2a resolved conflicts for merge of 8390651c to master ...

Change-Id: Ibaa6034dbf87473dfb7d8a324a5f91fc745b99aa

2010-10-05 12:11:56 -07:00

..

res

resolved conflicts for merge of 8390651c to master

2010-10-05 12:11:56 -07:00

src/com/android/systemui

manual merge Merge commit '77e42376' into work

2010-10-05 12:37:03 -04:00

Android.mk

Fix proguard flag file dependency.

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

AndroidManifest.xml

Several improvements to RecentActivities:

2010-09-28 17:39:46 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

Lights out.

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