commit 18b66aea059ce8db599fabd4b9db809f2dfdc19c
author Adam Powell <adamp@google.com> Thu Feb 12 17:26:41 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 12 17:26:41 2015 +0000
tree 9dd59d3094b5e7555427ba68a4e041b61165e587
parent 1b8f719460b52debfe326f2d712bf1f927660d19
parent 05ba1a92809ef17ef30297bdd67f2d4fb33670af

am 05ba1a92: am a16b158a: am 5a50c4a9: am a2cff538: Merge "Add DENSITY_280" into lmp-mr1-dev

* commit '05ba1a92809ef17ef30297bdd67f2d4fb33670af':
  Add DENSITY_280

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