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

* commit '9860d23d1eb9e2c00a820a98ec25550e139f1e35':
  DO NOT MERGE: Fix NPE in PhotoViewActivity
tree: a8582f8d47bab2b6406a9b5453707fe9856c3b4a
  1. res/
  2. sample/
  3. src/
  4. .gitignore
  5. Android.mk
  6. AndroidManifest.xml