am f7af90c9: am 3cf2a8e0: Merge "Fix a comment typo."

* commit 'f7af90c9df6e863c15b39da811f194435aa5da94':
  Fix a comment typo.
This commit is contained in:
Elliott Hughes 2015-08-04 01:07:09 +00:00 committed by Android Git Automerger
commit b5c4bc3833

View file

@ -3373,7 +3373,7 @@ std::string narrow(const std::wstring& utf16) {
// Convert from UTF-16 to UTF-8. // Convert from UTF-16 to UTF-8.
std::string narrow(const wchar_t* utf16) { std::string narrow(const wchar_t* utf16) {
// Note: Do not call SystemErrorCodeToString() from narrow() because // Note: Do not call SystemErrorCodeToString() from narrow() because
// SystemErrorCodeToString() calls narrows() and we don't want potential // SystemErrorCodeToString() calls narrow() and we don't want potential
// infinite recursion. // infinite recursion.
const int chars_required = WideCharToMultiByte(CP_UTF8, 0, utf16, -1, NULL, const int chars_required = WideCharToMultiByte(CP_UTF8, 0, utf16, -1, NULL,
0, NULL, NULL); 0, NULL, NULL);