commit 32ab32c85e13322e6c23cef339e7220b2006daf8
author Philip Nowell <pnowell@google.com> Fri Sep 26 15:10:46 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 26 15:10:46 2014 +0000
tree ce6bce37b59e78ec083c39164c6c317beeed675b
parent d95788bf85b7a21ed798f62557d7ca957ddca159
parent 31a141af13a77ff095c1e1c61644ccd5e051dec2

am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev

* commit '571730b4d1a438fadfdb2c6951483f00f6276518':
  Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.

core/java/android/util/DisplayMetrics.java

diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java
index 946a3f7..c855e57 100644
--- a/core/java/android/util/DisplayMetrics.java
+++ b/core/java/android/util/DisplayMetrics.java
@@ -81,7 +81,7 @@
 
     /**
      * Intermediate density for screens that sit somewhere between
-     * {@link #DENSITY_XXHIGH} (480 dpi) and {@link #DENSITY_XXXHIGH} (560 dpi).
+     * {@link #DENSITY_XXHIGH} (480 dpi) and {@link #DENSITY_XXXHIGH} (640 dpi).
      * This is not a density that applications should target, instead relying
      * on the system to scale their {@link #DENSITY_XXXHIGH} assets for them.
      */