tree 366035e3e9b517e30da8b091ce8094a66f6b250e
parent 04d1f371094bfad763a035acf9232e3ac0979516
parent 54d43c67449dfe2df323d138e57d8199c4ba6d37
author Paul Westbrook <pwestbro@google.com> 1360954158 -0800
committer Paul Westbrook <pwestbro@google.com> 1360954158 -0800

Merge branch 'goog/jb-ub-mail-ur8' into master

Conflicts:
	photoviewer/AndroidManifest.xml
	photoviewer/res/values/dimen.xml
	photoviewer/src/com/android/ex/photo/Intents.java
	photoviewer/src/com/android/ex/photo/PhotoViewActivity.java
	photoviewer/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
	photoviewer/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
	photoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
	photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
	photoviewer/src/com/android/ex/photo/provider/PhotoContract.java
	photoviewer/src/com/android/ex/photo/util/ImageUtils.java
	photoviewer/src/com/android/ex/photo/views/PhotoView.java

Change-Id: Icb06b228f0eab1f828a21507ec2fbe7ede998536