am c770ed8: Merge change 1069 into donut

Merge commit 'c770ed8a6bb7614ed4a85a672e4e6830bed19a95'

* commit 'c770ed8a6bb7614ed4a85a672e4e6830bed19a95':
  GpsStatus: Increase NUM_SATELLITES to 255 for future compatibility.
diff --git a/location/java/android/location/GpsStatus.java b/location/java/android/location/GpsStatus.java
index a40b1fb2..2cda7fa 100644
--- a/location/java/android/location/GpsStatus.java
+++ b/location/java/android/location/GpsStatus.java
@@ -25,7 +25,7 @@
  * This class is used in conjunction with the {@link Listener} interface.
  */
 public final class GpsStatus {
-    private static final int NUM_SATELLITES = 32;
+    private static final int NUM_SATELLITES = 255;
 
     /* These package private values are modified by the LocationManager class */
     private int mTimeToFirstFix;