commit a2cff538c70bfa1d1e4585280dddffa0e36b107b
author Adam Powell <adamp@google.com> Thu Feb 12 02:08:05 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 12 02:08:06 2015 +0000
tree dabdd76acf5048ebb8c89080a5ffbac9501fca8d
parent fee7c3af1dfba91e77f126aef7bff7d174927644
parent 7efff699b59961749431354ab2d7483e0d264ef9

Merge "Add DENSITY_280" into lmp-mr1-dev

api/22.txt

diff --git a/api/22.txt b/api/22.txt
index 3e11cda..144f292 100644
--- a/api/22.txt
+++ b/api/22.txt
@@ -31435,6 +31435,7 @@
     method public boolean equals(android.util.DisplayMetrics);
     method public void setTo(android.util.DisplayMetrics);
     method public void setToDefaults();
+    field public static final int DENSITY_280 = 280; // 0x118
     field public static final int DENSITY_400 = 400; // 0x190
     field public static final int DENSITY_560 = 560; // 0x230
     field public static final int DENSITY_DEFAULT = 160; // 0xa0

system-api/22.txt

diff --git a/system-api/22.txt b/system-api/22.txt
index e270926..e1a00e0 100644
--- a/system-api/22.txt
+++ b/system-api/22.txt
@@ -33660,6 +33660,7 @@
     method public boolean equals(android.util.DisplayMetrics);
     method public void setTo(android.util.DisplayMetrics);
     method public void setToDefaults();
+    field public static final int DENSITY_280 = 280; // 0x118
     field public static final int DENSITY_400 = 400; // 0x190
     field public static final int DENSITY_560 = 560; // 0x230
     field public static final int DENSITY_DEFAULT = 160; // 0xa0