1a76449a643ab1e544da54514cf09f6f17f4d075 - platform/frameworks/ex

commit	1a76449a643ab1e544da54514cf09f6f17f4d075	[log] [tgz]
author	Paul Westbrook <pwestbro@google.com>	Fri Feb 15 10:49:18 2013 -0800
committer	Paul Westbrook <pwestbro@google.com>	Fri Feb 15 10:49:18 2013 -0800
tree	2615a977c52d7a479001ed451a58aa484dbe75e0
parent	9f1ab148925b098cec90d06992ade0fca2889a14 [diff]
parent	e032f315b6f95896ff471e92a20a42159d53fa6a [diff]

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

tree: 2615a977c52d7a479001ed451a58aa484dbe75e0