Merge "Fix build." into eclair
tree: d28652020aba47e3d958f3afc8e9b168a641fe45
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk