am ecee3d35: Reconcile with jb-release nakasi-factoryrom-release

* commit 'ecee3d356546957d897983827d6388fb0a94aed0':
  Fix black screen when viewing Gmail image file attachment. Bug: 6415848
  Fix crash when select all is pressed.
  Fix ANR in PhotoPage.
  Fix SinglePhotoDataAdapter getScreenNail()
  bug #6176711: guard against null GalleryActionBar.
tree: 192aff1d1b13f4bfe2c2acabc917b633ef402fd8
  1. res/
  2. src/