tree 170ca9f82f580a56202473741a9c2d21c4becb60
parent 2805669954b70b918d7b24f6695c4da85d6f88e8
parent abaf69dd195aa55c151ab16730e9511539ed46e5
author Alexandra Gherghina <alexgherghina@google.com> 1422273936 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422273936 +0000

am abaf69dd: Merge "Update badge assets" into lmp-mr1-dev

* commit 'abaf69dd195aa55c151ab16730e9511539ed46e5':
  Update badge assets