OSDN Git Service

Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag." am: d758ce1586
authorStephen Chen <stewchen@google.com>
Sat, 3 Dec 2016 04:23:49 +0000 (04:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 3 Dec 2016 04:23:49 +0000 (04:23 +0000)
commita4d7d45df936ec35e9663e15da8abc0e6432ceb5
tree3510c60eaf74951e205518d06c80f884e18abbb9
parent434e16c7bc4a3253af173d4545ac5f00a84240f0
parentd738140b8d8868c0c295fdab97b3a5998c9aa2f7
Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag." am: d758ce1586
am: d738140b8d

Change-Id: Icb8eb81b2021ee12eccd9158974353120228e7c0
core/java/android/provider/Settings.java
packages/SettingsProvider/res/values/defaults.xml