tree 3510c60eaf74951e205518d06c80f884e18abbb9
parent 434e16c7bc4a3253af173d4545ac5f00a84240f0
parent d738140b8d8868c0c295fdab97b3a5998c9aa2f7
author Stephen Chen <stewchen@google.com> 1480739029 +0000
committer android-build-merger <android-build-merger@google.com> 1480739029 +0000

Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag." am: d758ce1586
am: d738140b8d

Change-Id: Icb8eb81b2021ee12eccd9158974353120228e7c0