722d67dcb6
Merge commit '46e462a380f90ed8101f9ac3f950a3c702772842' into eclair-plus-aosp * commit '46e462a380f90ed8101f9ac3f950a3c702772842': Only re-initialize backup state if @pm@ metadata is missing,