Amith Yamasani 9b8a465dbc am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1 ...

* commit 'aefc0ed9677233d5e8c991196f970222b4899dc3':
  Don't upgrade some settings from GB to ICS.

2011-11-17 10:02:29 -08:00

..

res

resolved conflicts for merge of faa81c82 to ics-aah

2011-11-10 14:29:46 -08:00

src/com/android/providers/settings

am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1

2011-11-17 10:02:29 -08:00

Android.mk

…

AndroidManifest.xml

Add boot mode where only "core apps" are started.

2011-09-12 12:29:43 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…