commit 889e961477cc1057439ceec7468120af6b21099e
author Sundeep Ghuman <sghuman@google.com> Tue Jun 06 12:27:25 2017 -0700
committer Sundeep Ghuman <sghuman@google.com> Wed Jun 07 12:56:33 2017 -0700
tree ca3a01b7a2c1599c6f55a14130605b9a0f365d47
parent 08b953dd2eb6545d21f78ba5584937ffd53d2194

DO NOT MERGE: Kill Wifi Badging in OC.

Speed labeling is turned on in O-DR hence this CL should not be merged
into master. Using the merged in tag below which implements speed
labeling (ag/2346102) to prevent this CL from being merged into upstream
branches which need scoring ui.

Merged-In: I0fd96da6a06dafd8c8ebb435a2725ab155bd26ed

Bug: b/35628911
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

Change-Id: I5740f68be25d5ec297f1f7dc3b3e59203cec2eb5