am b98eb1d0: am 487de5d1: Merge change I74688835 into eclair

Merge commit 'b98eb1d07b9c8eeaa7f57408dd2448af47778a6a' into eclair-mr2-plus-aosp

* commit 'b98eb1d07b9c8eeaa7f57408dd2448af47778a6a':
  Account for the gap at the top of the search widget when animating
tree: d947b8de953533787eaeb35398cebb5a3631b62e
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE