pensun bbd526b7e5 resolve conflicts for git pull ...

Change-Id: Ie353b831e2241bc28042069b6cc7405257e871e1


[ROCm/hip commit: 4d7ac1e091]

2016-11-09 21:38:43 -06:00

..

hip

resolve conflicts for git pull

2016-11-09 21:38:43 -06:00