tree b32d79232e496d5fef041f0b7dc8c9468a6eb756
parent 97670b46b3958cec0d07cfc17133fdda313ddf3e
parent 6568ffe6f41020ced1824dbc95ecdbb75dcddbac
author Yorke Lee <yorkelee@google.com> 1415816864 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415816865 +0000

Merge "Lookup badge member variables correctly during bindBadge" into lmp-mr1-dev