Merge 111d17ce

Change-Id: I2e0aa4328bc78eb5bcd987e7bf74b0889d2fae7f
2011-05-19 07:16:43 -07:00
parent d37b84edf5 111d17ce51
commit c6b7a0131e
3 changed files with 66 additions and 0 deletions
--- a/api/current.txt
+++ b/api/current.txt
@ -8839,6 +8839,7 @@ package android.hardware {
    field public static final deprecated int TYPE_ORIENTATION = 3; // 0x3
    field public static final int TYPE_PRESSURE = 6; // 0x6
    field public static final int TYPE_PROXIMITY = 8; // 0x8
+    field public static final int TYPE_RELATIVE_HUMIDITY = 12; // 0xc
    field public static final int TYPE_ROTATION_VECTOR = 11; // 0xb
    field public static final deprecated int TYPE_TEMPERATURE = 7; // 0x7
  }