OSDN Git Service

Merge "Clean up Wear CPU scaling and swap experiments."
authorAlice Sheng <alicesheng@google.com>
Wed, 6 Jun 2018 21:35:01 +0000 (21:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 6 Jun 2018 21:35:01 +0000 (21:35 +0000)
commit59ca58c1f533a8e4887896ec614e49c237717ef9
tree35a8240787e0ac56bb534b9ff0e9c5d41049d775
parent381678be2f3e6fec94c595317b3c80589429cdff
parent8385c0d5b516fe9ad807526a559c8abca4babe99
Merge "Clean up Wear CPU scaling and swap experiments."
core/java/android/provider/Settings.java
core/tests/coretests/src/android/provider/SettingsBackupTest.java
services/java/com/android/server/SystemServer.java