[automerger skipped] Merge "Cleanup logic in KillZramBackingDevice" am: 1e98e552c6 am: b0c6174a30 -s ours
am skip reason: Change-Id I4709da1d08cf427ad9c898cfb2506b6a29f1d680 with SHA-1 a840d405eb is in history
Change-Id: Id9e29f86f684f55e617e44c846c4d0b03494c4b0
This commit is contained in:
commit
18021cd525