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

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