OSDN Git Service

am f773a11d: Merge "Keep lights out even if the system changes it." into gb-ub-photos...
authorSascha Haeberling <haeberling@google.com>
Tue, 8 Apr 2014 19:35:35 +0000 (19:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Apr 2014 19:35:35 +0000 (19:35 +0000)
commitc29db9f8ca2f6c8db2d30e0a90e0a145512f2fb6
treee36e31abeba9943579f785ff1a5cad6fab073976
parent300e332a777c77761d20825ee0bb699f9b4b598d
parentf773a11d50fc48f3831f259075a0e64460f9baaa
am f773a11d: Merge "Keep lights out even if the system changes it." into gb-ub-photos-denali

* commit 'f773a11d50fc48f3831f259075a0e64460f9baaa':
  Keep lights out even if the system changes it.
src/com/android/camera/CameraActivity.java