Merge 'goog/jb-ub-now-carmello' into frameworks/opt/photoviewer

Change-Id: I4a338a8cf6650db88dfa1914dd4c0fa63c841d89
tree: 78f6bda8af730d282e5c89ee49f284ed214026a9
  1. res/
  2. sample/
  3. src/
  4. .gitignore
  5. Android.mk
  6. AndroidManifest.xml