OSDN Git Service

Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
authorWale Ogunwale <ogunwale@google.com>
Thu, 8 Jun 2017 14:41:34 +0000 (14:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 14:41:34 +0000 (14:41 +0000)
am: 13059cc2ad

Change-Id: I079d34636465188b0d2bd231c798c44343bbc3b5


Trivial merge