tree 58be6b7f47b673bca0c0e54c37a5d2c4f68575b9
parent 4a01d8f4e06cbecf4ca6d4f22ca7c03934604969
parent d25e864dde290a8f8a85772b5e141db055a4a4b8
author ztenghui <ztenghui@google.com> 1410982084 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410982084 +0000

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

* commit 'b20b6f24c0b7426601d1ea62fc2013b6690ff05c':
  Fix badge asset alpha issue