tree 2504a7160bfb80ce41eaa99088c6b5c9ba634bae
parent 39287e3d7660f6523632195f880ea15f955ccec1
parent 50905a474fc64f325d899877c46512a6c108c3aa
author Stephen Chen <stewchen@google.com> 1480739719 +0000
committer android-build-merger <android-build-merger@google.com> 1480739719 +0000

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

Change-Id: Idc7bc3e35343b06adebb035cc00b555db54289c5