tree 7688f7f41aa471ba8df3520966b6563b67a26670
parent 56bb344ccfd3d261cea9987c98a17d0820279b17
parent 75fc9de2587f493f79ac6719a57ce76f5b3e73df
author Craig Mautner <cmautner@google.com> 1340067713 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1340067713 -0700

Merge "More paths for turning on screen immediately." into jb-dev