tree 72e8bfcbf7e079796fa7b2decd640c1c5e1498fe
parent ab4d2a503f1a8d0e9f1fc32fdd40767d41c2b30f
parent 4726ba24087e83c841e0d0058df61dc908f01978
author Colin Cross <ccross@android.com> 1397855920 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397855920 +0000

am 4726ba24: am 40d49a02: am e99e5474: Merge "Sync persist property immediately,in case of suddenly remove the battery."

* commit '4726ba24087e83c841e0d0058df61dc908f01978':
  Sync persist property immediately,in case of suddenly remove the battery.