tree 29b4577981fde4b53a6c67f1491fb73809850d28
parent c86a48ffb931668cd4ebdb9f736c5e95e6cd3ed1
parent 0461b80018d3bfe06ead06ff1669441794d63350
author ztenghui <ztenghui@google.com> 1410982691 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410982691 +0000

am 570994b9: am b20b6f24: Merge "Fix badge asset alpha issue" into lmp-dev

* commit '570994b926b8cc094d69467db113aee51dd45405':
  Fix badge asset alpha issue