Android (Google) Code Review 4dd4ce292e am c56096fe: Merge change 5878 into donut ...

Merge commit 'c56096fe1fe3486102079f06ca5de3e2bef12e47'

* commit 'c56096fe1fe3486102079f06ca5de3e2bef12e47':
  Add new attribute 'searchSettingsDescription' for use within an app's

2009-07-01 22:44:50 -07:00

..

assets

Automated import from //branches/master/...@141533,141533

2009-03-24 20:29:58 -07:00

res

am c56096fe: Merge change 5878 into donut

2009-07-01 22:44:50 -07:00

Android.mk

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

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

AndroidManifest.xml

am dbcd9c34: Merge change 5654 into donut

2009-06-30 14:49:14 -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