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

ui/base/l10n/l10n_util_android.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 "ui/base/l10n/l10n_util_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/i18n/rtl.h"
@@ skipping 85 matching lines @@
           env,
           java_locale.obj(),
           java_display_locale.obj()));
   return ConvertJavaStringToUTF16(java_result);
 }
 
 jstring GetDurationString(JNIEnv* env, jclass clazz, jlong timeInMillis) {
   ScopedJavaLocalRef<jstring> jtime_remaining =
       base::android::ConvertUTF16ToJavaString(
           env,
-          ui::TimeFormat::TimeRemaining(
+          ui::TimeFormat::Simple(
+              ui::TimeFormat::FORMAT_REMAINING, ui::TimeFormat::LENGTH_SHORT,
               base::TimeDelta::FromMilliseconds(timeInMillis)));
   return jtime_remaining.Release();
 }
 
 bool RegisterLocalizationUtil(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace l10n_util