[Android] Make OS version reporting in the UA string legacy-compatible.

webkit/user_agent/user_agent_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/user_agent/user_agent_util.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <sys/utsname.h>
 #endif
 
@@ skipping 59 matching lines @@
     base::win::OSInfo::WindowsArchitecture windows_architecture =
         os_info->architecture();
     if (windows_architecture == base::win::OSInfo::X64_ARCHITECTURE)
       architecture_token = "; Win64; x64";
     else if (windows_architecture == base::win::OSInfo::IA64_ARCHITECTURE)
       architecture_token = "; Win64; IA64";
   }
 #endif
 
 #if defined(OS_ANDROID)
+  std::string android_version_str;
+  base::StringAppendF(
+      &android_version_str, "%d.%d", os_major_version, os_minor_version);
+  if (os_bugfix_version != 0)
+    base::StringAppendF(&android_version_str, ".%d", os_bugfix_version);
+
   std::string android_info_str;
 
   // Send information about the device.
   bool semicolon_inserted = false;
   std::string android_build_codename = base::SysInfo::GetAndroidBuildCodename();
   std::string android_device_name = base::SysInfo::GetDeviceName();
   if ("REL" == android_build_codename && android_device_name.size() > 0) {
     android_info_str += "; " + android_device_name;
     semicolon_inserted = true;
   }
@@ skipping 21 matching lines @@
       os_minor_version,
       os_bugfix_version
 #elif defined(OS_CHROMEOS)
       "CrOS "
       "%s %d.%d.%d",
       cputype.c_str(),   // e.g. i686
       os_major_version,
       os_minor_version,
       os_bugfix_version
 #elif defined(OS_ANDROID)
-      "Android %d.%d.%d%s",
-      os_major_version,
-      os_minor_version,
-      os_bugfix_version,
+      "Android %s%s",
+      android_version_str.c_str(),
       android_info_str.c_str()
 #else
       "%s %s",
       unixinfo.sysname,  // e.g. Linux
       cputype.c_str()    // e.g. i686
 #endif
   );  // NOLINT
 
   return os_cpu;
 }
@@ skipping 38 matching lines @@
       os_info.c_str(),
       WEBKIT_VERSION_MAJOR,
       WEBKIT_VERSION_MINOR,
       product.c_str(),
       WEBKIT_VERSION_MAJOR,
       WEBKIT_VERSION_MINOR);
   return user_agent;
 }
 
 }  // namespace webkit_glue