OSDN Git Service

Merge "Add knobs for tweaking blocking helper thresholds" into pi-dev
authorRohan Shah <shahrk@google.com>
Tue, 8 May 2018 21:17:35 +0000 (14:17 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 May 2018 21:17:35 +0000 (14:17 -0700)
commit566a00935e9c6ffe8f075974a03f91d708089d72
tree489f3364ee78dcd2f7df9c0207ef831a4bd47f0f
parent04621f5b2fe61e3cb578a97a6282f053769fedca
parent7af8fe3e295f40b6c4e9d247fcfa5069735af1c9
Merge "Add knobs for tweaking blocking helper thresholds" into pi-dev
am: 7af8fe3e29

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