Merge photo viewer changes from master

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