resolve merge conflicts of 8aaffd9 to nyc-dev

Change-Id: I4b1603b4cb1cdfc01f4842b2facf8c31a687bbe5

diff --cc services/core/java/com/android/server/location/GpsXtraDownloader.java
index c464371,1f8f90a..bf77985
--- 1/services/core/java/com/android/server/location/GpsXtraDownloader.java
--- 2/services/core/java/com/android/server/location/GpsXtraDownloader.java
+++ b/services/core/java/com/android/server/location/GpsXtraDownloader.java
@@@ -19,14 -19,14 +19,18 @@@ package com.android.server.location
  import android.text.TextUtils;
  import android.util.Log;
  
 +import java.io.IOException;
  import java.net.HttpURLConnection;
  import java.net.URL;
+ 
+ import java.io.ByteArrayOutputStream;
+ import java.io.InputStream;
+ import java.io.IOException;
  import java.util.Properties;
  import java.util.Random;
 +import java.util.concurrent.TimeUnit;
 +
 +import libcore.io.Streams;
  
  /**
   * A class for downloading GPS XTRA data.
@@@ -37,8 -37,8 +41,9 @@@ public class GpsXtraDownloader 
  
      private static final String TAG = "GpsXtraDownloader";
      private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+     private static final long MAXIMUM_CONTENT_LENGTH_BYTES = 1000000;  // 1MB.
      private static final String DEFAULT_USER_AGENT = "Android";
 +    private static final int CONNECTION_TIMEOUT_MS = (int) TimeUnit.SECONDS.toMillis(30);
  
      private final String[] mXtraServers;
      // to load balance our server requests