Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad

author Angus Kong <shkong@google.com>

Thu, 5 Sep 2013 04:47:51 +0000 (04:47 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 5 Sep 2013 04:47:52 +0000 (04:47 +0000)
author Angus Kong <shkong@google.com>
Thu, 5 Sep 2013 04:47:51 +0000 (04:47 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 5 Sep 2013 04:47:52 +0000 (04:47 +0000)
diff --cc src/com/android/camera/CameraActivity.java
Simple merge
author	Angus Kong <shkong@google.com>
	Thu, 5 Sep 2013 04:47:51 +0000 (04:47 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 5 Sep 2013 04:47:52 +0000 (04:47 +0000)