Merge "Remove support for obsoleted API set_blacklist_bssid" am: 0a132191e3 am: bb6ba...
Randy Pan [Tue, 13 Dec 2016 19:51:29 +0000 (19:51 +0000)]
am: 019d5d4809  -s ours

Change-Id: I89739bb7b7451e2aac419b693ef7c01258e4567f


Trivial merge