Merge "Added screen-off notifier." into devel
authorLi, Peng <peng.li@intel.com>
Mon, 16 Jul 2012 05:38:47 +0000 (22:38 -0700)
committerGerrit Code Review <gerrit2@tzgerrit>
Mon, 16 Jul 2012 05:38:47 +0000 (22:38 -0700)

Trivial merge