tree a8582f8d47bab2b6406a9b5453707fe9856c3b4a
parent c06b017aac740a6f9690f4c44c0068bc06db3206
parent 9860d23d1eb9e2c00a820a98ec25550e139f1e35
author Alice Yang <alice@google.com> 1363718862 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363718862 -0700

am 9860d23d: (-s ours) DO NOT MERGE: Fix NPE in PhotoViewActivity

* commit '9860d23d1eb9e2c00a820a98ec25550e139f1e35':
  DO NOT MERGE: Fix NPE in PhotoViewActivity