diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-10-22 14:35:09 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2010-10-22 14:35:09 -0700 |
commit | e6634981f12e1d218eaf61c6488af3d8c9f0d202 (patch) | |
tree | 74c9a3ba82b2584d30da2e44a7f2d15916d415c4 /core/java/android/os/Build.java | |
parent | 2351e69a13e8b9372cc4a33d28c1fd230f51faa3 (diff) | |
parent | 9c7489f8bdcd08990c44250cbad64399badc72be (diff) | |
download | frameworks_base-e6634981f12e1d218eaf61c6488af3d8c9f0d202.zip frameworks_base-e6634981f12e1d218eaf61c6488af3d8c9f0d202.tar.gz frameworks_base-e6634981f12e1d218eaf61c6488af3d8c9f0d202.tar.bz2 |
resolved conflicts for merge of 9c7489f8 to master
Change-Id: I1d8fd1146925f48ad690c89230d24dc8694703f4
Diffstat (limited to 'core/java/android/os/Build.java')
-rw-r--r-- | core/java/android/os/Build.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 9767786..b4c6a2923 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -188,15 +188,7 @@ public class Build { public static final int FROYO = 8; /** - * Next version of Android. - * - * <p>Applications targeting this or a later release will get these - * new changes in behavior:</p> - * <ul> - * <li> The status bar is now dark. Targeting this version allows - * the platform to perform performing compatibility on status bar - * graphics to ensure they look okay on a dark background. - * </ul> + * Newest version of Android, version 2.3. */ public static final int GINGERBREAD = 9; |