tree cf8b76d7462eb1eedb49c0859527acab71150426
parent 32a8e55e26c24f8034353427cb4e984d725e405a
parent 76336cfcd6e16c8bf8ac267974ce0577a60e8f72
author Chris Wren <cwren@android.com> 1394580508 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394580508 +0000

am 76336cfc: Merge "update promise icon status" into ub-now-mister-ugly

* commit '76336cfcd6e16c8bf8ac267974ce0577a60e8f72':
  update promise icon status