Merge "Use junit-host instead of junit" am: 75e4a422ec
am: 3c8cd0cd4b

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