tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 315967a6faf03684578325a200f9ccec216be1a4
parent 2bccd31abea962113ddfd0973a64f406ef54b61c
author Sunny Goyal <sunnygoyal@google.com> 1422685365 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685365 +0000

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

* commit '2bccd31abea962113ddfd0973a64f406ef54b61c':