tree f90c71f122cdd772964c410a86529143a5cdff78
parent e89635dab1106174e8929c087dfe7517d89c2a49
parent 4af44be3138f285f04b1bfc338811a4a7f38f32c
author Tom Turney <tturney@google.com> 1409686772 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409686772 +0000

Merge "Added changes to allow single parameter to scan facade's method setScanFilterServiceData to accept single parameter serviceData. Cleaned up every instance of scan in advertise facade to avoid confusion in logs." into lmp-dev