tree f03805631b280765892519eea1093afc663f3fc9
parent fe87596a5ba5a5b0773b2854f9fce85f49367611
parent 7b0d9b798474ab62d4bf67c79ae901f4c4789f27
author Ian Rogers <irogers@google.com> 1345516995 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345516995 -0700

am 7b0d9b79: Merge "Restore posix_memalign"

* commit '7b0d9b798474ab62d4bf67c79ae901f4c4789f27':
  Restore posix_memalign