Add support for localized time strings with two units, eg. "2 hours 17 minutes"

ui/ui.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 175 matching lines @@
         'base/gtk/gtk_signal.h',
         'base/gtk/gtk_signal_registrar.cc',
         'base/gtk/gtk_signal_registrar.h',
         'base/gtk/gtk_windowing.cc',
         'base/gtk/gtk_windowing.h',
         'base/gtk/owned_widget_gtk.cc',
         'base/gtk/owned_widget_gtk.h',
         'base/gtk/scoped_region.cc',
         'base/gtk/scoped_region.h',
         'base/hit_test.h',
+        'base/l10n/formatter.cc',
+        'base/l10n/formatter.h',
         'base/l10n/l10n_font_util.cc',
         'base/l10n/l10n_font_util.h',
         'base/l10n/l10n_util.cc',
         'base/l10n/l10n_util.h',
         'base/l10n/l10n_util_android.cc',
         'base/l10n/l10n_util_android.h',
         'base/l10n/l10n_util_collator.h',
         'base/l10n/l10n_util_mac.h',
         'base/l10n/l10n_util_mac.mm',
         'base/l10n/l10n_util_plurals.cc',
@@ skipping 421 matching lines @@
            'variables': {
              'jni_gen_package': 'ui',
              'jni_generator_ptr_type': 'long',
            },
            'includes': [ '../build/jni_generator.gypi' ],
          },
        ],
     }],
   ],
 }