tree f13e72dcf5424021439fad2079e031eb471e4766
parent 45a2329b2d3e928d48f546d6d6822620e0dac057
parent 3d671000c7268fcfcaf5445734b88428af26c294
author Elliott Hughes <enh@google.com> 1429848073 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429848073 +0000

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

* commit '3d671000c7268fcfcaf5445734b88428af26c294':
  Correct magic number on umount2