OSDN Git Service

am 46215a8b: am dfeb42ed: Merge "If the kernel doesn\'t have MADV_MERGEABLE, stop...
authorElliott Hughes <enh@google.com>
Mon, 3 Mar 2014 20:55:35 +0000 (20:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Mar 2014 20:55:35 +0000 (20:55 +0000)
commit1eb606df0abd10774d182b0490e6019d68a1dc0d
tree14251b29490ff6f62ced33b6d2d39838a2fe1a97
parent29264f4eda4baa8ad049f6cb1e063606e6e477b4
parent46215a8b53e149de3fc28600c2b2eebe66d36716
am 46215a8b: am dfeb42ed: Merge "If the kernel doesn\'t have MADV_MERGEABLE, stop asking for it."

* commit '46215a8b53e149de3fc28600c2b2eebe66d36716':
  If the kernel doesn't have MADV_MERGEABLE, stop asking for it.