OSDN Git Service

Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag."
authorStephen Chen <stewchen@google.com>
Sat, 3 Dec 2016 04:16:06 +0000 (04:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 3 Dec 2016 04:16:06 +0000 (04:16 +0000)
commitd738140b8d8868c0c295fdab97b3a5998c9aa2f7
tree79a5c4e124a09901e1d5ed664b8bba4ca827fb9e
parent9625912b7f0abd8fe74e15b58f4c70d89d48872a
parentd758ce1586dd8147a5bf96e58276859c1bdb1633
Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag."
am: d758ce1586

Change-Id: I1bf1effbb635d57980728555587e8056f630edb9
api/system-current.txt
core/java/android/provider/Settings.java
packages/SettingsProvider/res/values/defaults.xml