tree 8ebf91186c31d0a18da1022c73b18214b3d60238
parent 9213ab323b41495998d5091e540f2cc5c0707d28
parent d25e864dde290a8f8a85772b5e141db055a4a4b8
author ztenghui <ztenghui@google.com> 1410982048 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410982048 +0000

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

* commit 'b20b6f24c0b7426601d1ea62fc2013b6690ff05c':
  Fix badge asset alpha issue