tree 04a8869721e76d2963e64f6b4f1ac87276aa013e
parent 06f4dc5dfcaa1fd11a7be387d6b233a61a4a55fe
parent acefecbff3141b43dc55fe18146cf842d1d4a8ae
author Sunny Goyal <sunnygoyal@google.com> 1411157028 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411157028 +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