tree a99c3c230f9ab2cc6f4009753e0c2520c564af9e
parent 77434ab362b3234accf16499aaf2a5340d568553
parent 28693983510b140240e7b3e83c082e516b83896f
author Elliott Hughes <enh@google.com> 1429846771 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429846771 +0000

am 28693983: am 1a39a994: Merge "Correct magic number on umount2"

* commit '28693983510b140240e7b3e83c082e516b83896f':
  Correct magic number on umount2