tree 0496e3ff94041561e9235f6be08235195cbd836e
parent 1fca2650edb5ae373a297b6029df5e250c021dd3
parent 9028fb4d4ceed040c7d3ae9b1ceaa5a7472856ba
author Elliott Hughes <enh@google.com> 1355775107 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355775107 -0800

am 9028fb4d: Merge "Pass the correct pointer to munmap on failure."

* commit '9028fb4d4ceed040c7d3ae9b1ceaa5a7472856ba':
  Pass the correct pointer to munmap on failure.