tree e1518c68deaa1f24c30006c6816fbbab57536800
parent d423d51a8b69af0dcc3ef349bd81f13a7b249a76
parent d00f71f141a7962045271cccebad9438e3b452e7
author Mark Wei <markwei@google.com> 1348146482 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348146482 -0700

am da78c1dc: am c907eecd: Prevent NPE while viewing photo from attachment.

* commit 'da78c1dc07cd36e04c98f1d468b45766f1e0e0c6':
  Prevent NPE while viewing photo from attachment.