tree 8d1061c103a8eee76f3124e1d2accc2d83f1b458
parent 78c90c2376fd1338cd889f145aeb4482bea20e07
parent 219bbafc3fa40dae163d652365cc4a97d613011f
author Makoto Onuki <omakoto@google.com> 1447292384 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1447292384 +0000

Merge "Revert "Do not call into ActivityManager from DPMS within DPMS lock""