am adeadda2: am caaeda95: Merge "Add a toString() method to Sensor for debugging purposes." into jb-mr1-dev

* commit 'adeadda2027ecc87399ce4504145a5bcc78e1bec':
  Add a toString() method to Sensor for debugging purposes.

2 files changed, 2 insertions, 2 deletions

diff --git a/api/17.txt b/api/17.txt
index 984b844..c43802f 100644
--- a/api/17.txt
+++ b/api/17.txt
@@ -9802,7 +9802,7 @@ package android.hardware {
     method public float getZ();
   }
 
-  public class Sensor {
+  public final class Sensor {
     method public float getMaximumRange();
     method public int getMinDelay();
     method public java.lang.String getName();
diff --git a/api/current.txt b/api/current.txt
index c7ecfce..a6aaa9d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -9848,7 +9848,7 @@ package android.hardware {
     method public float getZ();
   }
 
-  public class Sensor {
+  public final class Sensor {
     method public float getMaximumRange();
     method public int getMinDelay();
     method public java.lang.String getName();