am 94dea6e4: Merge "Refactor UsageStatistic so it can be disabled more easily." into...

* commit '94dea6e4d1744aeaa5001a5023fb0a7ecb124128':
  Refactor UsageStatistic so it can be disabled more easily.

diff --cc src/com/android/camera/CameraActivity.java
Simple merge

diff --cc src/com/android/camera/PhotoModule.java
Simple merge

diff --cc src/com/android/camera/VideoModule.java
index 0bba64b,5003c96..8038854
--- 1/src/com/android/camera/VideoModule.java
--- 2/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@@ -68,10 -67,8 +68,9 @@@ import com.android.camera.hardware.Hard
  import com.android.camera.module.ModuleController;
  import com.android.camera.settings.SettingsManager;
  import com.android.camera.settings.SettingsUtil;
- import com.android.camera.util.AccessibilityUtils;
  import com.android.camera.util.ApiHelper;
  import com.android.camera.util.CameraUtil;
 +import com.android.camera.util.SmartCameraHelper;
  import com.android.camera.util.UsageStatistics;
  import com.android.camera2.R;
  import com.google.common.logging.eventprotos;

diff --cc src/com/android/camera/app/CameraApp.java
Simple merge