Merge "Print timestamp (instead of age) in Location#toString()" into jb-mr1-dev

Author: Nick Pelly

location/java/android/location/Location.java

@@ -825,9 +825,8 @@ public String toString() {
         if (mElapsedRealtimeNano == 0) {
             s.append(" et=?!?");
         } else {
-            long age = SystemClock.elapsedRealtimeNano() - mElapsedRealtimeNano;
-            s.append(" age=");
-            TimeUtils.formatDuration(age / 1000000L, s);
+            s.append(" et=");
+            TimeUtils.formatDuration(mElapsedRealtimeNano / 1000000L, s);
         }
         if (mHasAltitude) s.append(" alt=").append(mAltitude);
         if (mHasSpeed) s.append(" vel=").append(mSpeed);