diff options
| author | Randy Pan <zpan@google.com> | 2016-10-06 10:46:57 -0700 |
|---|---|---|
| committer | Randy Pan <zpan@google.com> | 2016-10-06 10:46:57 -0700 |
| commit | f44e4d233e847e3a197c8c85e320e8fd761981ec (patch) | |
| tree | 208f64a195f4c57689fc073c797605f516ec1aa9 /tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java | |
| parent | 407eeab2b7ff2f06b970e36537965facf5bd98d3 (diff) | |
| parent | a99eaf256db19e33209da1ff77c62cc865f494fd (diff) | |
| download | android_frameworks_opt_net_wifi-f44e4d233e847e3a197c8c85e320e8fd761981ec.tar.gz android_frameworks_opt_net_wifi-f44e4d233e847e3a197c8c85e320e8fd761981ec.tar.bz2 android_frameworks_opt_net_wifi-f44e4d233e847e3a197c8c85e320e8fd761981ec.zip | |
resolve merge conflicts of a99eaf2 to nyc-mr1-dev-plus-aosp
Change-Id: I2047023d049c801038d18f93d4a2f8638f4a6c35
Diffstat (limited to 'tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java index db3aff14c..ae15bbba2 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java @@ -294,7 +294,6 @@ public class WifiNetworkSelectorTestUtil { } - /** * Configure the score cache for externally scored networks * |