Merge change I4f939d74 into eclair

* changes:
  Fix LocationManagerTest:testSendExtraCommand.
tree: 3f928ca2ca1612ecfc0f94396ef0b9fc26b6d842
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk