resolve merge conflicts of e6431c7 to master

Change-Id: I9d3c5fd5c8b73add93894a21d2f17ed0ae442a32
2016-09-13 19:08:11 -07:00
parent 73f8eda988 e6431c79c7
commit 14e9535fc8
2 changed files with 5 additions and 3 deletions
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.INetworkStatsSession;
+import android.net.NetworkPolicy;
 import android.net.NetworkTemplate;
 import android.net.TrafficStats;
 import android.os.Bundle;
@@ -226,7 +227,6 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
        DataUsageController.DataUsageInfo info = mDataUsageController.getDataUsageInfo(
                mDefaultTemplate);
        Context context = getContext();
-
        mDataInfoControler.updateDataLimit(info,
                services.mPolicyEditor.getPolicy(mDefaultTemplate));