Merge "1. Deprecate sound policy related API 2. Add resource conflict related API...
authorJeongmo Yang <jm80.yang@samsung.com>
Fri, 28 Aug 2015 09:34:43 +0000 (02:34 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 28 Aug 2015 09:34:43 +0000 (02:34 -0700)

Trivial merge