tree 963c1548c3f0b882e8067cbc2f9df9c2c2f01168
parent ac263c5868994d21cf72c27d2ce982716c99aff9
parent ef71b24dbf31f73e6df8ae15ac2a1ad1cbc255f6
author Chih-Chung Chang <chihchung@google.com> 1321880371 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321880371 -0800

am 8cbc7c4e: Merge "Fix 5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1

* commit '8cbc7c4eedb204e3ad9fa1cb8a7a1b21f7464c74':
  Fix 5637927: NPE while trying to do slide show for gmail image attachment