Amith Yamasani 52cb1da2c6 am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1 ...

* commit 'f336408000c4be36045401fb4df89528249e7383':
  New and improved silent mode on lockscreen.

2011-12-07 11:02:51 -08:00

..

res

resolved conflicts for merge of ea25ea7e to ics-aah

2011-12-07 10:47:48 -08:00

src/com/android/providers/settings

am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1

2011-12-07 11:02:51 -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

…