6d3179332d
Merge commit '7805933738de33b1961bd03553237a86d90792dd' into eclair-plus-aosp * commit '7805933738de33b1961bd03553237a86d90792dd': Add additional error checking, exit early if errors occur.