Merge branch 'parser' into demo
authorPawel Wieczorek <p.wieczorek2@samsung.com>
Fri, 5 Jan 2018 11:57:05 +0000 (12:57 +0100)
committerPawel Wieczorek <p.wieczorek2@samsung.com>
Fri, 5 Jan 2018 11:57:05 +0000 (12:57 +0100)
Change-Id: Ife2a46c429099da8a5a58fafb5649e3e28b9057e


Trivial merge