tree 74a39d4284bfa8006d1fa3b796d46e410613ddfd
parent c494d535894da28f32e95e79ea0cfc5814d1fe75
parent b0c23f29a77e4f7f90807119a38069533c32ef58
author Alice Yang <alice@google.com> 1363718960 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363718960 +0000

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

* commit 'b0c23f29a77e4f7f90807119a38069533c32ef58':
  DO NOT MERGE: Fix NPE in PhotoViewActivity