Merge branch 'devel/tizen' into tizen 11/33411/1
authorBoram Park <boram1288.park@samsung.com>
Fri, 9 Jan 2015 06:20:36 +0000 (15:20 +0900)
committerBoram Park <boram1288.park@samsung.com>
Fri, 9 Jan 2015 06:20:38 +0000 (15:20 +0900)
Change-Id: I01add9ad1344245f16924f89c77d0f4983fca2d6


Trivial merge