tree 1a54671dbc20af39ffc8b82e3d7debbbaa25371a
parent 067f9816b1fe6285b6448c617cbce8f495d97046
parent a5be28971cb974260a86430550793d89eb878425
author Chiayu Pei <chiayupei@google.com> 1561388650 -0700
committer android-build-merger <android-build-merger@google.com> 1561388650 -0700

Merge "Revert "Unregister listeners and reset wake lock"" into qt-dev
am: a5be28971c

Change-Id: I649e2774d8f08bf5a2ea666074b04fd22c69ff0f