pensun 068e744783 Revert "resolve merge conflict" ...

This reverts commit 64f6a4f1b0.


[ROCm/hip commit: d69e56fdc9]

2016-09-16 16:04:48 -05:00

..

hip

Revert "resolve merge conflict"

2016-09-16 16:04:48 -05:00