commit 3b726758f14cb79a8b9d40d65149d0990ef78ec9
author Philip Nowell <pnowell@google.com> Fri Sep 26 19:43:21 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 26 19:43:21 2014 +0000
tree 65961bf7b2a857211f6d332ad172a672e8f648e6
parent f0619add9ec2c107073e5b62f4e0b75157cd7700
parent 5fec1ec61beac4398264bb6c7a2cdba710536230

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

* commit 'f1234ed20dcd1f77e5bd2e705f0516306403bc47':
  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.
      */