tree cc6be9b788aad72f754fe7a381c8d53da6cb2d08
parent 9027a990c7583cfd44418630333677fde4466c6c
parent 29226627d0898713558c4e03d237d100796d7d53
author Jia-yi Chen <jychen@google.com> 1541551957 -0800
committer android-build-merger <android-build-merger@google.com> 1541551957 -0800

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

Change-Id: I18a5f507f0e50d1212ee40573a3a6a687e5d0052