tree b61e6cf3f517e8beef65b4fcaccdadbdbf18d381
parent 77337eecb0f3f23722b45c50a5d5c75e627be107
parent a3c448d37ad600c61a6dfa9e0131b83cc5d1c822
author Andrew Lehmer <alehmer@google.com> 1501205546 +0000
committer android-build-merger <android-build-merger@google.com> 1501205546 +0000

Merge "Merge "AOD: Introduce night brightness bucket" into oc-dr1-dev am: 6b978e0106 am: 7ce226bd6c" into oc-mr1-dev-plus-aosp
am: a3c448d37a

Change-Id: I944335265773819b2a44e9d0db7529f6f489c55a