[automerger skipped] Merge "Check user unlocked before write to /data/system_ce/0/snapshots" am: 8737830ed4 am: 00ac337a69 -s ours

am skip reason: Change-Id Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is in history

Change-Id: I11a756cd26d7f978924fc0be1c0d162852a08519
This commit is contained in:
Peter Kalauskas
2020-05-18 22:18:55 +00:00
committed by Automerger Merge Worker

Diff Content Not Available