Merge change I78c0cbf5 into eclair

* changes:
  Fix FileAccessPermissionTest.java.
tree: 7ba1d4718b7919fdcec4fe1431323ed2c5705282
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk