am 1a25b5b6: am d03e01e1: Merge "Final touches on no-fav card." into klp-dev

* commit '1a25b5b61cf197792cacf51f3148cfab08502100':
tree: e812ed0c3a53e8c1d05dfd2ea97d5bcb8d348bde
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags