Merge "Fix some more unit tests..." into mnc-dev
tree: 6076ef79aec247ddfce1d7643d616ddfa8a8e56a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags