Merge branch 'tizen_2.2' into tizen 39/10439/1 accepted/tizen/20131002.050422 accepted/tizen/20131002.170520 accepted/tizen/20131002.172302 submit/tizen/20131002.044721
authorKyungwooNoh <kw1004.noh@samsung.com>
Wed, 2 Oct 2013 01:58:44 +0000 (10:58 +0900)
committerKyungwooNoh <kw1004.noh@samsung.com>
Wed, 2 Oct 2013 01:59:06 +0000 (10:59 +0900)
commit994d96ed725362c2d21a32e786283e84261318d4
treeb655f1f92b08e1f769a07c156d697433757e1771
parent310f9179d2ae0e4879fdde375332c1779bfb5214
parentc88baf25d87b74e3954b81dc1a4c415c93c3ca94
Merge branch 'tizen_2.2' into tizen

Conflicts:
am_daemon/amd_launch.c

Change-Id: I19b1529045ef9ccc9cd222a23c6dba7be1e55542
Signed-off-by: KyungwooNoh <kw1004.noh@samsung.com>
aul.manifest
packaging/ac.service
packaging/aul.spec
packaging/launchpad-preload@.service