Merge "Unhide GsmCellLocation.getPsc()." into gingerbread

api/current.xml

@@ -152023,6 +152023,17 @@
  visibility="public"
 >
 </method>
+<method name="getPsc"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="setLacAndCid"
  return="void"
  abstract="false"

telephony/java/android/telephony/gsm/GsmCellLocation.java

@@ -60,8 +60,10 @@ public class GsmCellLocation extends CellLocation {
     }
 
     /**
+     * On a UMTS network, returns the primary scrambling code of the serving
+     * cell.
+     *
      * @return primary scrambling code for UMTS, -1 if unknown or GSM
-     * @hide
      */
     public int getPsc() {
         return mPsc;