Merge change Ibd3343f8 into eclair

* changes:
  Quick fix for SQLiteQueryBuilderTest:testSetProjectionMap.
tree: 24ea32b5db6c0cdd3cfe6ef58b3995e5ed471577
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk