Mike Cleron 7b81fe7773 am 11d8d62e: am 4ca8c837: Merge change Ia4087911 into eclair ...

Merge commit '11d8d62e740ea171b19ed32306f3db2973a5242a'

* commit '11d8d62e740ea171b19ed32306f3db2973a5242a':
  Newer icons

2009-10-01 11:54:20 -07:00

..

etc

am 9db0d36c: Merge change 7600 into donut

2009-07-17 02:08:53 -07:00

res

am 11d8d62e: am 4ca8c837: Merge change Ia4087911 into eclair

2009-10-01 11:54:20 -07:00

src/com/android/providers/settings

Merge change 27177 into eclair

2009-09-27 13:20:44 -04:00

Android.mk

auto import from //branches/cupcake/...@137197

2009-03-09 11:52:12 -07:00

AndroidManifest.xml

Expand apps' control over the settings restore process

2009-09-01 20:59:36 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00