Merge "Move display orientation calculations out of app code" into ub-camera-glacier

author Sol Boucher <solb@google.com>

Fri, 8 Aug 2014 00:20:57 +0000 (00:20 +0000)

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

Thu, 7 Aug 2014 15:00:45 +0000 (15:00 +0000)
author Sol Boucher <solb@google.com>
Fri, 8 Aug 2014 00:20:57 +0000 (00:20 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 7 Aug 2014 15:00:45 +0000 (15:00 +0000)
diff --cc src/com/android/camera/CaptureModule.java
Simple merge
author	Sol Boucher <solb@google.com>
	Fri, 8 Aug 2014 00:20:57 +0000 (00:20 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 7 Aug 2014 15:00:45 +0000 (15:00 +0000)