Merge branch 'tizen' into tizen_line_coverage

Change-Id: I4164f814dce9acd3a384d3d4b7945b19cfccaae7

diff --cc src/sound_manager_private.c
index 5b9fb1d,2fbc44c..04392ed
--- 1/src/sound_manager_private.c
--- 2/src/sound_manager_private.c
+++ b/src/sound_manager_private.c
@@@ -2538,8 -2504,7 +2529,6 @@@ ERROR_WITH_UNLOCK
                }
        }
        LOGE("pa_ret(%d)", pa_ret);
- 
- ERROR:
 -//LCOV_EXCL_STOP
        return ret;
  }