pensun 64f6a4f1b0 resolve merge conflict ...

Change-Id: I041730d4208ae1865820f5df73a67ba60fd4bc3c


[ROCm/hip commit: 575e1f5024]

2016-09-16 11:13:43 -05:00

..

hip

resolve merge conflict

2016-09-16 11:13:43 -05:00