OSDN Git Service

Merge "Add setting for disabling swap." into pi-dev
authorAlice Sheng <alicesheng@google.com>
Fri, 23 Mar 2018 18:11:12 +0000 (18:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 23 Mar 2018 18:11:12 +0000 (18:11 +0000)
commit7384995cf80ed0e93943e2aa872bff435784bafd
treef23a2b0e8e44d3a40f5ab5197c412b4b4dbb0703
parent991b971acbb4675636ccab8b3d9ba891c5f7d936
parentb32b1ad3734e66d8df4940e741e35c228e9f8547
Merge "Add setting for disabling swap." into pi-dev
core/java/android/provider/Settings.java
core/tests/coretests/src/android/provider/SettingsBackupTest.java