tree 969bd46f2981c9a3870c06d09d462249f3c06b7e
parent c609f4db3f08ef14db1612ac50af5e4e8aa1c580
parent 358aed4587c3c278bff61b90291d4e69ab6b5b04
author Jorim Jaggi <jjaggi@google.com> 1414696488 +0000
committer android-build-merger <android-build-merger@google.com> 1414696488 +0000

am 81aef807: Merge "Improve doze transitions" into lmp-mr1-dev
automerge: 358aed4

* commit '358aed4587c3c278bff61b90291d4e69ab6b5b04':
  Improve doze transitions