Merge branch 'master' into tizen_2.1
authorJaeho Lee <jaeho81.lee@samsung.com>
Wed, 20 Mar 2013 07:57:52 +0000 (16:57 +0900)
committerJaeho Lee <jaeho81.lee@samsung.com>
Wed, 20 Mar 2013 07:57:52 +0000 (16:57 +0900)
commitec5a330539509ee5360809699e0e758046f8d55f
treee7cb45fe1ed9a56f51fb8c8a9f7987dc85977a42
parent58ab92967fb7d55e23e6df229475f536c097b008
parent6113f1956bfd1fcbf5af54a7fec5928f4a1be35b
Merge branch 'master' into tizen_2.1

added a type

Conflicts:
alarm-server.manifest
packaging/alarm-manager.spec

Signed-off-by: Jaeho Lee <jaeho81.lee@samsung.com>