tree ba3a074f9442c5d3c0af3bb183a402e80c42433b
parent a4eb50eaa7a9f59cb02fce88a6852a4bb9c8ac5c
parent ceba91f88893687fb82165a54f81c9d8688b43f0
author Vinay Kalia <vinaykalia@google.com> 1504899811 +0000
committer android-build-merger <android-build-merger@google.com> 1504899811 +0000

Merge "Adapt scan settings based on client state."
am: ceba91f888

Change-Id: I8db384e3763f10239d525cd7c5caf629d25995c7