commit 711516d140390aeec9e3eefb8fdb2681c3454980
author Dianne Hackborn <hackbod@google.com> Tue Jun 14 12:17:35 2011 -0700
committer Dianne Hackborn <hackbod@google.com> Tue Jun 14 12:17:35 2011 -0700
tree f73caa003154567d63dfa36089d443f51bed52df
parent f0b517d9d287e86e6e57a372ddcb070cec1fe1c0
parent 77fc8b8066709a1d09a159901fd65c49b5e6eaa5

resolved conflicts for merge of 77fc8b80 to master

Change-Id: I014f9a886d6f05607d2a5d101ad2052a6841ee8d

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 569b206..b46909f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5821,6 +5821,8 @@
     field public static final java.lang.String FEATURE_LOCATION_NETWORK = "android.hardware.location.network";
     field public static final java.lang.String FEATURE_MICROPHONE = "android.hardware.microphone";
     field public static final java.lang.String FEATURE_NFC = "android.hardware.nfc";
+    field public static final java.lang.String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape";
+    field public static final java.lang.String FEATURE_SCREEN_PORTRAIT = "android.hardware.screen.portrait";
     field public static final java.lang.String FEATURE_SENSOR_ACCELEROMETER = "android.hardware.sensor.accelerometer";
     field public static final java.lang.String FEATURE_SENSOR_BAROMETER = "android.hardware.sensor.barometer";
     field public static final java.lang.String FEATURE_SENSOR_COMPASS = "android.hardware.sensor.compass";