tree db1775295eb3d9cac321ec25d557a20ab277218d
parent 5dc8db7bd5d8cf743083cb7efd4fbd0e57f4382a
parent a4a4135c97ee4de94df78630cbe48965b19c9513
author Ficus Kirkpatrick <ficus@android.com> 1372707634 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372707634 -0700

am a4a4135c: am 5a1110cb: am 3c479905: Merge "NetworkImage - fix nullPointerException."

* commit 'a4a4135c97ee4de94df78630cbe48965b19c9513':
  NetworkImage - fix nullPointerException.