tree 28a3e3533b5677c07a2bd690353363e6b7682edc
parent 58770232216cd735afdfd3dd53151070e06de5ce
parent 30e5eb4826a2b6880fb8ef3844206cc5ffd13ed9
author Jeff Brown <jeffbrown@google.com> 1336789997 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336789997 -0700

Merge "Tell power HAL when user activity occurs." into jb-dev