tree f380c13f1a182538eeb3201bfbfd848f6371622f
parent 2f3fc1170b13ba247451b6f9ae2cc43faf5c3373
author Matteo Scandolo <matteo.scandolo@gmail.com> 1489168497 -0800
committer Matteo Scandolo <matteo.scandolo@gmail.com> 1489168497 -0800

Tracking xos-gui master for E-CORD

Change-Id: Ifb0e593424d4e3830e3b03482ed78e911b825aa6