resolved conflicts for merge of cbd8267e to gb-ub-photos-denali

Change-Id: I24dcc27aa7aef1575f03b6ceaf418cf49712a170

diff --cc src/com/android/camera/CameraActivity.java
index 52792ba,29bf408..efec3a9
--- 1/src/com/android/camera/CameraActivity.java
--- 2/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@@ -88,12 -87,17 +88,19 @@@ import com.android.camera.util.GcamHelp
  import com.android.camera.util.IntentHelper;
  import com.android.camera.util.PhotoSphereHelper;
  import com.android.camera.util.PhotoSphereHelper.PanoramaViewHelper;
 +import com.android.camera.util.RefocusHelper;
+ import com.android.camera.util.UsageStatistics;
++
  import com.android.camera2.R;
  
+ import java.io.File;
+ 
+ import static com.android.camera.CameraManager.CameraOpenErrorCallback;
+ 
  public class CameraActivity extends Activity
          implements ModuleSwitcher.ModuleSwitchListener,
-         ActionBar.OnMenuVisibilityListener {
+         ActionBar.OnMenuVisibilityListener,
+         ShareActionProvider.OnShareTargetSelectedListener {
  
      private static final String TAG = "CAM_Activity";