am d2ecc30d: am 639b823b: Merge "Fix build." into eclair

Merge commit 'd2ecc30d8cc4b4f18ea2e0a026b58285a073a7fe'

* commit 'd2ecc30d8cc4b4f18ea2e0a026b58285a073a7fe':
  Fix build.
tree: fd722a537c66b2ea454aae9b46511f5dbbdd977b
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk