Merge branch 'devel/master' into tizen 39/108339/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Wed, 4 Jan 2017 06:09:56 +0000 (15:09 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Wed, 4 Jan 2017 06:10:37 +0000 (15:10 +0900)
- Integration 1.2.18 -> 1.2.20 (Version up)

Change-Id: I3104bc41564c340e5dbb3155d27382222d8651e6


Trivial merge