tree 6a82c5b9a23fdce53be396e84640b90b4f21d9d7
parent 1c28e96bf0692f3aa41417e7af75ace11b3c4af7
parent 13059cc2ad427e4247b4f6e81f854de33d59b9cd
author Wale Ogunwale <ogunwale@google.com> 1496932894 +0000
committer android-build-merger <android-build-merger@google.com> 1496932894 +0000

Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
am: 13059cc2ad

Change-Id: I079d34636465188b0d2bd231c798c44343bbc3b5