Android (Google) Code Review b322287594 am 60a0ad65: Merge change 5329 into donut ...

Merge commit '60a0ad65f4cd7dedbbd06993d107fb1b72d072c6'

* commit '60a0ad65f4cd7dedbbd06993d107fb1b72d072c6':
  frameworks/base - CDMA settings additions

2009-06-24 23:41:00 -07:00

..

etc

AI 144949: remove Maps

2009-04-08 00:38:40 -07:00

res

Squashed commit of the following:

2009-06-17 15:17:29 -07:00

src/com/android/providers/settings

am 60a0ad65: Merge change 5329 into donut

2009-06-24 23:41:00 -07:00

Android.mk

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

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

AndroidManifest.xml

Squashed commit of the following:

2009-06-17 15:17:29 -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