Merge branch 'api' 58/185558/1 cors
authorPawel Wieczorek <p.wieczorek2@samsung.com>
Mon, 30 Jul 2018 16:09:57 +0000 (18:09 +0200)
committerPawel Wieczorek <p.wieczorek2@samsung.com>
Mon, 30 Jul 2018 16:09:57 +0000 (18:09 +0200)
Change-Id: I73745abe146f5e9d6e3a9ba886f727da53a2b32e


Trivial merge