tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 7a788c7a509818ee363fc05406997e37d5bc17cf
parent f7e3bf981d30a2fc87076501bf33b5249684eb54
author Sunny Goyal <sunnygoyal@google.com> 1422669735 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669735 +0000

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

* commit 'f7e3bf981d30a2fc87076501bf33b5249684eb54':