India-China border stand-off resolved: minister