Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a021e922 authored by Neil Fuller's avatar Neil Fuller
Browse files

resolved conflicts for merge of 12260ad7 to lmp-mr1-dev-plus-aosp 

Change-Id: Ie2222794208475216941289cf062e05ca9c75e0f
parents 789ca682 12260ad7

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -30345,7 +30345,7 @@ package android.text.format { 
    method public static java.lang.String formatShortFileSize(android.content.Context, long);

  }













  public class Time {













  public deprecated class Time {















    ctor public Time(java.lang.String);















    ctor public Time();















    ctor public Time(android.text.format.Time);










@@ -31716,7 +31716,7 @@ package android.util {













    field public final int mTag;















  }



























  public class FloatMath {













  public deprecated class FloatMath {















    method public static float ceil(float);















    method public static float cos(float);















    method public static float exp(float);

























core/java/android/text/format/Time.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -48,7 +48,10 @@ import libcore.util.ZoneInfoDB;













 *     <li>Much of the formatting / parsing assumes ASCII text and is therefore not suitable for















 *     use with non-ASCII scripts.</li>















 * </ul>













 *













 * @deprecated Use {@link java.util.GregorianCalendar} instead.















 */













@Deprecated















public class Time {















    private static final String Y_M_D_T_H_M_S_000 = "%Y-%m-%dT%H:%M:%S.000";















    private static final String Y_M_D_T_H_M_S_000_Z = "%Y-%m-%dT%H:%M:%S.000Z";

































core/java/android/util/FloatMath.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -24,7 +24,10 @@ package android.util;













 * became slower and have since been re-implemented to wrap calls to















 * {@link java.lang.Math}. {@link java.lang.Math} should be used in















 * preference.













 *













 * @deprecated Use {@link java.lang.Math} instead.















 */













@Deprecated















public class FloatMath {































    /** Prevents instantiation. */