tree d3fda528174be33817494aa43f30aebb61d26c56
parent da6ace3a7253a97adfa182633fe222002b866762
parent af9361f56553f5520bcca0dd456bac86bb14fc10
author Julius D'souza <jdsouza@google.com> 1477109603 +0000
committer android-build-merger <android-build-merger@google.com> 1477109603 +0000

Merge "Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"" into cw-f-dev am: e88cbbf40d
am: af9361f565  -s ours

Change-Id: I06dca83d8bee11d0f8ad64770f7bff2e78ff40a9