Merge remote-tracking branch 'origin/tizen' into da-setting 92/26892/1
authorheeyoung <heeyoung1008.hwang@samsung.com>
Thu, 28 Aug 2014 06:45:16 +0000 (15:45 +0900)
committerheeyoung <heeyoung1008.hwang@samsung.com>
Thu, 28 Aug 2014 06:47:13 +0000 (15:47 +0900)
Change-Id: Idbb9a5625da81a30aa8cff547236d418a9f27f95
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>

Trivial merge