tree ef67412396890deffbfef74b0307c55a26ca6767
parent 04b393a812bbbe9975df6e7d20514c797398d571
parent 33538249f26f0cc637eac636f3712f972916595d
author Prashant Malani <pmalani@google.com> 1416044792 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1416044793 +0000

Merge "Don't animate screen brightness if there is a pending off transition" into lmp-sprout-dev