am f773a11d: Merge "Keep lights out even if the system changes it." into gb-ub-photos...

* commit 'f773a11d50fc48f3831f259075a0e64460f9baaa':
  Keep lights out even if the system changes it.

diff --cc src/com/android/camera/CameraActivity.java
index ddd7bd1,539e08f..32049e4
--- 1/src/com/android/camera/CameraActivity.java
--- 2/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@@ -126,12 -126,10 +127,12 @@@ import com.android.camera.util.UsageSta
  import com.android.camera.widget.FilmstripView;
  import com.android.camera.widget.Preloader;
  import com.android.camera2.R;
 +import com.bumptech.glide.Glide;
 +import com.bumptech.glide.resize.ImageManager;
  import com.google.common.logging.eventprotos;
- import com.google.common.logging.eventprotos.NavigationChange;
- import com.google.common.logging.eventprotos.MediaInteraction;
  import com.google.common.logging.eventprotos.ForegroundEvent.ForegroundSource;
+ import com.google.common.logging.eventprotos.MediaInteraction;
+ import com.google.common.logging.eventprotos.NavigationChange;
  
  import java.io.File;
  import java.io.FileInputStream;