FIXUP: resolve rebase conflicts
authorPawel Wieczorek <p.wieczorek2@samsung.com>
Tue, 12 Dec 2017 17:09:28 +0000 (18:09 +0100)
committerPawel Wieczorek <p.wieczorek2@samsung.com>
Fri, 5 Jan 2018 12:44:55 +0000 (13:44 +0100)
commit1c908a9c921983ec9505fd7b52b87a597c48f7e2
tree32ca07ac42a0229c99712d050ac04aae675d3844
parent43382ae63d51bf64b0dac0e0dc4a63e6cede5d2c
FIXUP: resolve rebase conflicts

Change-Id: If391d3803a2525ce7f804a418bd9aca9bce89b48
controller/boruterimpl.go
controller/downloaderimpl.go