tree d34a0687873e3d17df621a81d8463462f5e53cd4
parent 596c22a84d46a646c4b1ab6163822cbaa01eb229
parent d3dac85e46dc438304df752f48498e03e58f7b17
author Jeremy Klein <jlklein@google.com> 1516835611 +0000
committer android-build-merger <android-build-merger@google.com> 1516835611 +0000

Merge "Add scan interval and window lengths to Settings.Global."
am: d3dac85e46

Change-Id: Ibae30208c4f0f2ad8bf8e508778d73f0883ef42e