Merge branch 'sandbox/cyeon/devel' into tizen 54/60954/1
authorChangyeon Lee <cyeon.lee@samsung.com>
Thu, 3 Mar 2016 06:33:04 +0000 (15:33 +0900)
committerChangyeon Lee <cyeon.lee@samsung.com>
Thu, 3 Mar 2016 06:33:29 +0000 (15:33 +0900)
Change-Id: I8a73629615fea52f660c6ee06fecdaff6c968db2
Signed-off-by: Changyeon Lee <cyeon.lee@samsung.com>

Trivial merge