Merge branch 'devel/master' into tizen 61/137161/1
authorJinho, Lee <jeano.lee@samsung.com>
Tue, 4 Jul 2017 12:52:03 +0000 (21:52 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Tue, 4 Jul 2017 12:52:12 +0000 (21:52 +0900)
commite38695cd6cc35f2981ea9980a015b678bc23c6be
treeb3e05626d6ef09d7e7055bf351883ce0c31e2917
parentb7a31d25cffa2bc4fb4c24d561378ae9b1a31232
parent7bc41e89300781e9f9fef78fd83c126f98a05b3f
Merge branch 'devel/master' into tizen

Change-Id: Ie31341e5982d1a9af4507e9659ba08fe5cf20369
build/tizen/adaptor/Makefile.am