Merge "Revert "Move power manager to system server so."\r \r This reverts commit 10eb46...
authorJungHoon Kim <david_kim31@samsung.com>
Tue, 25 Jun 2013 10:35:15 +0000 (10:35 +0000)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Tue, 25 Jun 2013 10:35:15 +0000 (10:35 +0000)

Trivial merge