OSDN Git Service

Merge "Add setting for disabling swap." into pi-dev
authorAlice Sheng <alicesheng@google.com>
Fri, 23 Mar 2018 19:47:06 +0000 (19:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Mar 2018 19:47:06 +0000 (19:47 +0000)
commit6036a2b5bfe48d1763ad74aceca1fde7f6dfd997
tree67a01ce631c30f779dfc969145d639a359e7cd19
parent98be440cfcb0327fe7f1e76cbcd8fba025f29262
parent7384995cf80ed0e93943e2aa872bff435784bafd
Merge "Add setting for disabling swap." into pi-dev
am: 7384995cf8

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