[automerger skipped] Merge "Unregister listeners and reset wake lock" into qt-dev am: 8dc0ab0aeb
am:fb1d52c295-s ours am skip reason: change_id I9bc993f372a8c05258f1778eb3d415af04544714 with SHA12d34523527is in history Change-Id: I35d789fe98cacc249ef9732d9a4217db54bfbc7f
This commit is contained in: