tree 10da860fcff71886af91d082e31f0e1917926848
parent 2f347b448c2892ed51e1806acf4f19cd40f382d8
parent f2316a7386e6fc0c0b5caf6e341876a26c6cddad
author Sunny Goyal <sunnygoyal@google.com> 1422666550 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666550 +0000

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

* commit 'f2316a7386e6fc0c0b5caf6e341876a26c6cddad':