[automerger skipped] Merge "Unregister listeners and reset wake lock" into qt-dev am: 8dc0ab0aeb am: fb1d52c295 -s ours

am: 0a3ab11370 -s ours
am skip reason: change_id I9bc993f372a8c05258f1778eb3d415af04544714 with SHA1 2d34523527 is in history

Change-Id: I0daf9d66e2c5a40868ae3b5e76b7503a59621d12
This commit is contained in:
Lucas Dupin
2019-06-24 13:09:48 -07:00
committed by android-build-merger

Diff Content Not Available