tree 668289472dbe92c477de9a997c987973570b9b25
parent 621d12e7e3aa4397076cddf69606a0b109b1d648
parent b32ebf308a95ffa937d9b9a36417cdea70add0e5
author Paul Lawrence <paullawrence@google.com> 1430956074 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430956074 +0000

am b32ebf30: Merge "Retry unmounts in ext4 encryption"

* commit 'b32ebf308a95ffa937d9b9a36417cdea70add0e5':
  Retry unmounts in ext4 encryption