tree 167176db27b677c4ede863176fb9a59212222af2
parent 8f4be068d3c370a03c22d2160fdc819a4e9ca628
parent cac8e4a5aaf35e1dae23da3b4557d8f3d37c07b8
author Filip Gruszczynski <gruszczy@google.com> 1415214086 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415214086 +0000

am cac8e4a5: am 093e9890: am 34afdf02: Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev

* commit 'cac8e4a5aaf35e1dae23da3b4557d8f3d37c07b8':
  Automatic brightness using ALS while dozing.