Merge "Fixing a failing test."
tree: 6c4c5dc0dbaeb4ce56e7f2e589fa3b946f782a89
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml