tree 5aec47aeb6c50f3f515feea1f25e2c3b4d9ff519
parent dd7d0468fa2d3babaf0d9db37f348fb766881a14
parent 4382c93af4f79786ece40ebedc12f77d1aeb80ca
author Peter Qiu <zqiu@google.com> 1476376991 +0000
committer android-build-merger <android-build-merger@google.com> 1476376991 +0000

Merge "Do not send ANQP queries when no Hotspot 2.0 provider is configured" into nyc-mr1-dev
am: 4382c93af4

Change-Id: Id4a6a19efacdb84238a0677c48d383a564b669ca