upload again, rietveld diff failed.

src/core/SkString.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkString.h"
@@ skipping 551 matching lines @@
     this->set(buffer, strlen(buffer));
 }
 
 void SkString::appendf(const char format[], ...) {
     char    buffer[kBufferSize];
     ARGS_TO_BUFFER(format, buffer, kBufferSize);
 
     this->append(buffer, strlen(buffer));
 }
 
-void SkString::appendf(const char format[], va_list args) {
+void SkString::appendVAList(const char format[], va_list args) {
     char    buffer[kBufferSize];
     VSNPRINTF(buffer, kBufferSize, format, args);
 
     this->append(buffer, strlen(buffer));
 }
 
 void SkString::prependf(const char format[], ...) {
     char    buffer[kBufferSize];
     ARGS_TO_BUFFER(format, buffer, kBufferSize);
 
@@ skipping 46 matching lines @@
 SkString SkStringPrintf(const char* format, ...) {
     SkString formattedOutput;
     char buffer[kBufferSize];
     ARGS_TO_BUFFER(format, buffer, kBufferSize);
     formattedOutput.set(buffer);
     return formattedOutput;
 }
 
 #undef VSNPRINTF
 #undef SNPRINTF