Merge branch 'controller' into demo
authorPawel Wieczorek <p.wieczorek2@samsung.com>
Fri, 5 Jan 2018 12:39:24 +0000 (13:39 +0100)
committerPawel Wieczorek <p.wieczorek2@samsung.com>
Fri, 5 Jan 2018 12:39:24 +0000 (13:39 +0100)
commit59d837e7d0a82cce3f5334cf5d8690ba1584766f
tree193e7c0c666cbfff9aa33098498121fad08d4ff3
parent6505b5bb62ee767212e2976f97c8d2af525e5d73
parentf7f97932980881c22a7a9f06608ecc9b4eb17598
Merge branch 'controller' into demo

Change-Id: Ib9691e2ba4c5984b48867dbd1847017d04e3ca02