Merge commit 'b2346324e5f6062fed7bdeaedb9cf968b05050ec' into eclair-mr2-plus-aosp * commit 'b2346324e5f6062fed7bdeaedb9cf968b05050ec': Do not advance mLastEventTime when enabling or disabling user activity.
Merge commit 'b2346324e5f6062fed7bdeaedb9cf968b05050ec' into eclair-mr2-plus-aosp * commit 'b2346324e5f6062fed7bdeaedb9cf968b05050ec': Do not advance mLastEventTime when enabling or disabling user activity.