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

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