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

* commit '3cf2a8e0ee7dbf504763cc446d5cf1ee451158fc':
  Fix a comment typo.
This commit is contained in:
Elliott Hughes 2015-08-04 00:58:39 +00:00 committed by Android Git Automerger
commit f7af90c9df

View file

@ -3373,7 +3373,7 @@ std::string narrow(const std::wstring& utf16) {
// Convert from UTF-16 to UTF-8.
std::string narrow(const wchar_t* utf16) {
// 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.
const int chars_required = WideCharToMultiByte(CP_UTF8, 0, utf16, -1, NULL,
0, NULL, NULL);