Merge "Remove support for obsoleted API set_blacklist_bssid" am: 0a132191e3
authorRandy Pan <zpan@google.com>
Tue, 13 Dec 2016 19:38:52 +0000 (19:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 19:38:52 +0000 (19:38 +0000)
commite5847fb0a0f571a97e1049c08411e097035fd854
treed14aabbd7470c482d22202625ba55d7167878ea9
parentb5dfb120494cebe2198ee3989c54968f5c49ba44
parentbb6ba00fb68d51ade9d6da5c7ec712e363e223a3
Merge "Remove support for obsoleted API set_blacklist_bssid" am: 0a132191e3
am: bb6ba00fb6  -s ours

Change-Id: Ib7e98e502db0592ae7aa6081a4cd00d1eb0dd8d8