diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-24 11:36:46 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2014-10-24 11:36:46 +0100 |
| commit | a021e922184ee16fc019e29c066719daa793dd2b (patch) | |
| tree | e7c30190da555c7d38b1e51eec8094e2be58fffb /core | |
| parent | 789ca68203550274dfd47f0c155b3a06f56a2b3a (diff) | |
| parent | 12260ad72c80672c7c32711c1b12002f3c424361 (diff) | |
| download | frameworks_base-a021e922184ee16fc019e29c066719daa793dd2b.zip frameworks_base-a021e922184ee16fc019e29c066719daa793dd2b.tar.gz frameworks_base-a021e922184ee16fc019e29c066719daa793dd2b.tar.bz2 | |
resolved conflicts for merge of 12260ad7 to lmp-mr1-dev-plus-aosp
Change-Id: Ie2222794208475216941289cf062e05ca9c75e0f
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/text/format/Time.java | 3 | ||||
| -rw-r--r-- | core/java/android/util/FloatMath.java | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/text/format/Time.java b/core/java/android/text/format/Time.java index 3c90ab6..0c66709 100644 --- a/core/java/android/text/format/Time.java +++ b/core/java/android/text/format/Time.java @@ -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"; diff --git a/core/java/android/util/FloatMath.java b/core/java/android/util/FloatMath.java index 90e0636..8f488af 100644 --- a/core/java/android/util/FloatMath.java +++ b/core/java/android/util/FloatMath.java @@ -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. */ |