Merge branch 'tizen_p2.3.1' into opensrc_p2.3.1 41/145141/1
authorjinh0.choi <jinh0.choi@samsung.com>
Mon, 21 Aug 2017 10:44:02 +0000 (19:44 +0900)
committerjinh0.choi <jinh0.choi@samsung.com>
Mon, 21 Aug 2017 10:44:08 +0000 (19:44 +0900)
Change-Id: Iccd9846baad748f061531766038bf40e37dd9293
Signed-off-by: jinh0.choi <jinh0.choi@samsung.com>

Trivial merge