Merge branch 'devel/master' into tizen 91/108391/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Wed, 4 Jan 2017 07:42:33 +0000 (16:42 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Wed, 4 Jan 2017 07:43:41 +0000 (16:43 +0900)
- Integration 1.2.14 -> 1.2.20 (Version up)

Change-Id: If9f846623edd5af4521e8288ce208607a5cda1d1


Trivial merge