tree 43ef80311160dddf2bf4e784153a8ebf814b5b37
parent 4f36d642a48729ae196e4b510a6bb86bf7981bf7
parent 63a40069d35f7cb5cf342d48ba176b06cb7d673b
author TreeHugger Robot <treehugger-gerrit@google.com> 1501166753 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501166753 +0000

Merge changes from topic 'aod-mr1' into oc-mr1-dev

* changes:
  Add new config to tell us whether brightness is bucketed or continuous
  Report the display is off when the hardware blanks itself.