tree 2bed96af3d5ccd542d7185e93f1403113adfa259
parent c44ee41872c599d99fc2bf6552f5e9c16a8ad25b
parent 9ec065de4d3f323bbda2da034ff414d9d045b48c
author Randy Pan <zpan@google.com> 1465952808 +0000
committer android-build-merger <android-build-merger@google.com> 1465952808 +0000

Merge \"QNS: cut down BSSID blacklist time to 5 minutes\" into nyc-dev
am: 9ec065de4d

Change-Id: I5a70af56b5f94100506e9db4d83c41c7dc5801c2