conflict resolved by syncing with 'xianyi:develop'
authorShivraj Patil <shivraj.patil@imgtec.com>
Wed, 4 May 2016 05:37:14 +0000 (11:07 +0530)
committerShivraj Patil <shivraj.patil@imgtec.com>
Wed, 4 May 2016 05:37:14 +0000 (11:07 +0530)
commit085cf236c237973b490ff02076f85115a7eeb0f8
treebdbd04a57eb4d3e6b0a47cd329c87fa7658699f0
parentb7b3d8ec8ee178edd980e97a7138e2d03f7a55b7
parent0d1c6955082908cf46211abce2b0359b5ef1f3fc
conflict resolved by syncing with 'xianyi:develop'

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
CONTRIBUTORS.md
param.h