Merge "Remove support for obsoleted API set_blacklist_bssid" am: 0a132191e3 am: bb6ba...
authorRandy Pan <zpan@google.com>
Tue, 13 Dec 2016 19:51:29 +0000 (19:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 19:51:29 +0000 (19:51 +0000)
commit2af7731184804c5ac01d0e56a1ff00de44715ae4
treee22c1501c19a90395ac66a83dc97db713e4dc67e
parent349628dac49d52f4e9c3c58809e1107b8ede404f
parent019d5d48099d401b7b76afa6b4a11fcdb2cc1711
Merge "Remove support for obsoleted API set_blacklist_bssid" am: 0a132191e3 am: bb6ba00fb6  -s ours am: e5847fb0a0  -s ours
am: 019d5d4809  -s ours

Change-Id: I89739bb7b7451e2aac419b693ef7c01258e4567f