Mike Cleron a60a1ef869 am 03ecab42: am 7957eaa6: Merge change Iee9b30d3 into eclair ...

Merge commit '03ecab425235bdb5e3548900284e8089c3d72e5e'

* commit '03ecab425235bdb5e3548900284e8089c3d72e5e':
  New icons

2009-10-01 11:34:19 -07:00

..

etc

am 9db0d36c: Merge change 7600 into donut

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

res

am 03ecab42: am 7957eaa6: Merge change Iee9b30d3 into eclair

2009-10-01 11:34:19 -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