Merge "Remove support for obsoleted API set_blacklist_bssid" am: 0a132191e3 am: bb6ba...
authorRandy Pan <zpan@google.com>
Tue, 13 Dec 2016 19:44:57 +0000 (19:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 19:44:57 +0000 (19:44 +0000)
commit019d5d48099d401b7b76afa6b4a11fcdb2cc1711
treed14aabbd7470c482d22202625ba55d7167878ea9
parent815726e9a7900cee3f5b2b61c59962c76aae5199
parente5847fb0a0f571a97e1049c08411e097035fd854
Merge "Remove support for obsoleted API set_blacklist_bssid" am: 0a132191e3 am: bb6ba00fb6  -s ours
am: e5847fb0a0  -s ours

Change-Id: If99eabd84115f875c88d8638544aa02acef38ec0