Merge branch 'devel/master' into tizen 98/127798/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 01:37:51 +0000 (10:37 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 01:37:59 +0000 (10:37 +0900)
commitad3cef136eccf053768fa1d1e6b85be153a3d487
tree00fff15fbc54200deeb3fc96cb14ab4a47c2dd9d
parentc80dd39a3bca0b86b013143c1c93e2d31832c0f1
parentffebfb2b0ccfdfca3ecb6fe7a1fb80d5aefa5f19
Merge branch 'devel/master' into tizen

Change-Id: I8edb9525b2a2cf1ab7ba31684667eb088e6b6919