tree fb4ba49fee9c53a1eecad7abf3f4a9c28c81be5e
parent 395e3f51805149bf810d55b4e9e8968b76f59fd1
parent b61fde1f3d3352c510263d91b1654bcfd075c10d
author John Spurlock <jspurlock@google.com> 1393965757 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393965757 +0000

am b61fde1f: am b85214bc: am 0a3bc3c4: am 2cc271eb: am d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev

* commit 'b61fde1f3d3352c510263d91b1654bcfd075c10d':
  Allow lights-out + bar icon dimming on low-end devices.