tree ff434cfbc07382b13f8b531027ea36a26c4fea7d
parent dd2f248a07318fbbae7fbf8882e618b507cf360b
parent 4f9fcffce7328b8f3f9a8384c51220f4a2cda8ba
author Michael Runge <mrunge@google.com> 1418248592 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418248592 +0000

am 4f9fcffc: am 37ad1f12: Merge "Force write to disk while doing uncrypt" into lmp-mr1-dev

* commit '4f9fcffce7328b8f3f9a8384c51220f4a2cda8ba':
  Force write to disk while doing uncrypt