Merge "Fixes relative time formatting issue for dates in future"

Author: Dianne Hackborn

core/java/android/text/format/DateUtils.java

@@ -1618,7 +1618,7 @@ public static CharSequence getRelativeTimeSpanString(Context c, long millis,
 
         String result;
         long now = System.currentTimeMillis();
-        long span = now - millis;
+        long span = Math.abs(now - millis);
 
         synchronized (DateUtils.class) {
             if (sNowTime == null) {