Merge "Make the appropriate cast to protect from mingw." am: dbf8c17bd2

am: 2edfa8c9b0

* commit '2edfa8c9b00cd0c0bd18738f75e0928394b99c76':
  Make the appropriate cast to protect from mingw.
This commit is contained in:
Dan Albert
2016-01-16 02:25:22 +00:00
committed by android-build-merger

View File

@@ -2119,7 +2119,7 @@ static status_t writeResourceLoadedCallbackForLayoutClasses(
indentStr);
}
return hasErrors ? UNKNOWN_ERROR : NO_ERROR;
return hasErrors ? STATUST(UNKNOWN_ERROR) : NO_ERROR;
}
static status_t writeResourceLoadedCallback(