am 70486a1c: Merge "Fix some more unit tests..." into mnc-dev

* commit '70486a1cc4ee0028a726d7b7777ee0a2fb6cd145':
  Fix some more unit tests...
tree: 644c3b6d53869e93d9e909c76eb8c5770519862f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags