tree 5999b4abeaa280a75a2b8eb67a301b3d1739bac2
parent c56cc1af34c3c84336cc6dc3072934ecd15d4cdf
parent 8ee89e7b60e4b6c51a810b0f121a18dc079585e4
author Tao Bao <tbao@google.com> 1433901259 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433901259 +0000

am 8ee89e7b: am b89452ef: am 1a03b400: Merge "uncrypt: Write status when it reboots to factory reset"

* commit '8ee89e7b60e4b6c51a810b0f121a18dc079585e4':
  uncrypt: Write status when it reboots to factory reset