[automerger skipped] Merge "Persist data to disk when system shuts down" into pi-dev am: 29226627d0

am: 560055e29d  -s ours

Change-Id: Id4a0549d14b3b94bb35683d236d2e1059d230ad0
This commit is contained in:
Jia-yi Chen
2018-11-06 17:07:13 -08:00
committed by android-build-merger

Diff Content Not Available