tree e536d6e0ba54d0adcf8aa641a65d2d6debb3ee04
parent db239f91d6641b7cd966464250bed2f2339e9609
parent 0c923b7ce1f4e40b401bcd342f4ee4399f4ad9d7
author Adam Lesinski <adamlesinski@google.com> 1380586198 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380586198 -0700

am 0c923b7c: Merge "Add badging of Payment apps" into klp-dev

* commit '0c923b7ce1f4e40b401bcd342f4ee4399f4ad9d7':
  Add badging of Payment apps