am 3a13c56e: am c599b6f4: am afb64682: Merge "Lookup badge member variables correctly during bindBadge" into lmp-mr1-dev

* commit '3a13c56eca834717f1a5888551febc1d5e94390d':
  Lookup badge member variables correctly during bindBadge
tree: ad62bed85b77533431c321a2807aef4340c23519
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags