Merge "Fix problem where part of wrong photo shows"

This is a manual merge of:
https://googleplex-android-review.googlesource.com/#/c/260544/1

Change-Id: Id872c4dd23db5c0d4e107a52a50a43c4b12a291d
2 files changed
tree: a674749f4065f427692ac195839289a2023bb5a4
  1. res/
  2. sample/
  3. src/
  4. .gitignore
  5. Android.mk
  6. AndroidManifest.xml