tree 8068b6bf251b700d78ee4ec44cd37e29b9988c31
parent 1389ae2ea3376b317e4810f9e3b123a0cb5ac008
parent 8cf57a5aa662abd4776ffd4a4261d45bfa05f5ea
author Mark Wei <markwei@google.com> 1347918832 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347918832 -0700

am 34672da4: am 4030071b: am 697c046e: Prevent NPE in Gmail while viewing photo from attachment

* commit '34672da452ddf07347d2e9fc02f6d66c954ebba3':
  Prevent NPE in Gmail while viewing photo from attachment