am 8bab83c8: am 598e9a68: Merge "Persist favorites clicked listener across activity destruction" into klp-dev

* commit '8bab83c87e95eb0780ea8c1c9ab7f2f032c78bcd':
tree: 701114b5c0756dc29829857bdb8d6e8048c01ac0
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags