Merge "Fix broken cts content tests." into eclair
tree: 76c92613b9f11a39e4bff4fa6f537cd56d07f8f9
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk