resolved conflicts for merge of 7cb8c791 to ub-camera-everglades

Change-Id: Iad7e7f78ae8e48456493451a62b154fa0e6c8cb3

diff --cc src/com/android/camera/PhotoModule.java
index 872c866,8396830..11236ad
--- 1/src/com/android/camera/PhotoModule.java
--- 2/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@@ -65,10 -64,8 +64,9 @@@ import com.android.camera.exif.Rational
  import com.android.camera.hardware.HardwareSpec;
  import com.android.camera.hardware.HardwareSpecImpl;
  import com.android.camera.module.ModuleController;
 +import com.android.camera.remote.RemoteCameraModule;
  import com.android.camera.settings.SettingsManager;
  import com.android.camera.settings.SettingsUtil;
- import com.android.camera.ui.RotateTextToast;
  import com.android.camera.util.ApiHelper;
  import com.android.camera.util.CameraUtil;
  import com.android.camera.util.GcamHelper;