am 28656d87: am a63efa5c: reconcile main tree with open-source eclair

Merge commit '28656d8707fa4e953f3934088792e2ee1158ce03'

* commit '28656d8707fa4e953f3934088792e2ee1158ce03':
  android-2.1_r1 snapshot
tree: 1a93cb8c4ea4ecaf8f9c5f7969ff6238f88291f8
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk