am 95b2e5f9: am 46979a81: (-s ours) Merge change I37f3fff6 into eclair

Merge commit '95b2e5f9505a995ce293339fab44c9ec7f7866ea' into eclair-mr2-plus-aosp

* commit '95b2e5f9505a995ce293339fab44c9ec7f7866ea':
tree: a724a2280d50653128b0284f9cef212906062fb0
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. AndroidManifest_test.xml