pensun 6c680d648b resolve merge conflict ...

Change-Id: I041730d4208ae1865820f5df73a67ba60fd4bc3c


[ROCm/clr commit: 213fd6c961]

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

..

clr/hipamd

resolve merge conflict

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