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

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