tree 06b1b9f361edc9ca78860bd1309d5fef20156dd3
parent 8e1b6d949be6d71cfb137f22d0b36bcf511568e2
parent 2f1964a9330ee9d25d0bf90e01dc34a1ceaf2ce4
author Alexandra Gherghina <alexgherghina@google.com> 1422274675 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422274675 +0000

am 2f1964a9: am 1a4802b9: am abaf69dd: Merge "Update badge assets" into lmp-mr1-dev

* commit '2f1964a9330ee9d25d0bf90e01dc34a1ceaf2ce4':
  Update badge assets