tree f9466ea7b3bdc409b0611b77f05e6a55b6a5ea1f
parent 0995af83e76aaf97fb498a51cf2c71b0daf1ca98
parent acefecbff3141b43dc55fe18146cf842d1d4a8ae
author Sunny Goyal <sunnygoyal@google.com> 1413648490 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413648490 +0000

am acefecbf: Merge "Updating promise icon\'s bitmap and label when onBadgingChanged is received" into ub-now-porkchop

* commit 'acefecbff3141b43dc55fe18146cf842d1d4a8ae':
  Updating promise icon's bitmap and label when onBadgingChanged is received