OSDN Git Service

Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev
authorPeter Qiu <zqiu@google.com>
Thu, 3 Aug 2017 04:36:31 +0000 (04:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 04:36:31 +0000 (04:36 +0000)
am: fca9a47ba8

Change-Id: I2e892a455ded1cb364eb449d35601c0ca3b7f02f


Trivial merge