OSDN Git Service

Merge "Add scan interval and window lengths to Settings.Global." am: d3dac85e46
authorJeremy Klein <jlklein@google.com>
Wed, 24 Jan 2018 23:34:38 +0000 (23:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Jan 2018 23:34:38 +0000 (23:34 +0000)
commit4ec192fd268b7d70b167beb31f48ad5613d7032f
treec82420a27345578014112f2e72d13f18f0cb97da
parent07b212b7881ae1b0d1adc7f098f5597ac6cc839b
parent8c33c789edb76cf388aa657635952be79717d24b
Merge "Add scan interval and window lengths to Settings.Global." am: d3dac85e46
am: 8c33c789ed

Change-Id: Ib86750eadcf5683faba4151e3f3373f04a387de1
core/java/android/provider/Settings.java
core/tests/coretests/src/android/provider/SettingsBackupTest.java