pensun 83250c6a54 resolve conflicts of doc_update ...

[ROCm/clr commit: cb352a17c3]

2016-02-27 15:08:45 -06:00

..

clr/hipamd

resolve conflicts of doc_update

2016-02-27 15:08:45 -06:00