Merge "Use junit-host instead of junit" am: eafda48599 am: 4d0a75dc75
am: 329b994eee

Change-Id: I7d9b69b050e776a9cc62a23ebe51b4c2420b265c
tree: 0a1bac425c978a143eac99f3ab5ce0bf1e729073
  1. src/
  2. tests/
  3. .classpath
  4. .gitignore
  5. .project
  6. Android.mk