tree 69b524c9528791d0da19a6784b6fc859cb5cf1d3
parent 4824965fc5b403d3ca5018f65077d953e3b80b42
parent d8293fbf284a8375da7473660c2ffeddfc08189e
author Sunny Goyal <sunnygoyal@google.com> 1410986787 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410986787 +0000

am d8293fbf: Merge "Null check in flushInvalidIcons" into ub-now-porkchop

* commit 'd8293fbf284a8375da7473660c2ffeddfc08189e':
  Null check in flushInvalidIcons