am 6afeb2c1: am 7dd487ec: am bdf60d08: Fix unit test errors.

* commit '6afeb2c1a64c8903e6d2a4d3fbf41de4fb14d6a6':
  Fix unit test errors.
tree: 77ff59c38291d0732b3f9a739bd222b36252d8e8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags