Merge "xena_multistream_fix: Fix multistream json config"
authorMaryam Tahhan <maryam.tahhan@intel.com>
Mon, 23 May 2016 08:36:29 +0000 (08:36 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 23 May 2016 08:36:29 +0000 (08:36 +0000)

Trivial merge