tree f49ffaf6af1fb3f4de8426af55563ead4204693d
parent 50e61bee5ac52f7e63d018c13115240f6fc4af11
parent c599b6f4ef7b4f53d1f98acdb5bf24e6d7085110
author Yorke Lee <yorkelee@google.com> 1415836213 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415836213 +0000

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