Merge remote-tracking branch 'origin/release-20161231' into devel 49/107549/1
authorSoonKyu Park <sk7.park@samsung.com>
Wed, 28 Dec 2016 11:35:15 +0000 (20:35 +0900)
committerSoonKyu Park <sk7.park@samsung.com>
Wed, 28 Dec 2016 11:35:15 +0000 (20:35 +0900)
Conflicts:
expanddeps
init_buildsystem

Change-Id: Id0fb3374dc790780bd4aa9fec7183d07975afb02

1  2 
debian/changelog

Simple merge