am 997dc32b: Merge "add an api for getting a device serial number" into gingerbread

Merge commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934' into gingerbread-plus-aosp

* commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934':
  add an api for getting a device serial number

api/current.xml

@@ -121342,6 +121342,16 @@
  visibility="public"
 >
 </field>
+<field name="SERIAL"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="TAGS"
  type="java.lang.String"
  transient="false"

core/java/android/os/Build.java

@@ -62,6 +62,9 @@ public class Build {
     /** The name of the hardware (from the kernel command line or /proc). */
     public static final String HARDWARE = getString("ro.hardware");
 
+    /** A hardware serial number, if available.  Alphanumeric only, case-insensitive. */ 
+    public static final String SERIAL = getString("ro.serialno");
+  
     /** Various version strings. */
     public static class VERSION {
         /**