tree fb106097c697cd46ebac8f1e892b61a243487546
parent 0703efeae25523e8f870cbf70f57b9ecc1186ac7
parent 763ac28357f604e0e4196e0a7ad5b0f5cdcf274a
author Iliyan Malchev <malchev@google.com> 1256348370 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256348370 -0700

am 763ac283: Merge changes Ibcba4b4f,I9af341e1 into eclair

Merge commit '763ac28357f604e0e4196e0a7ad5b0f5cdcf274a' into eclair-plus-aosp

* commit '763ac28357f604e0e4196e0a7ad5b0f5cdcf274a':
  bionic/linker: make the buddy allocator compute max_order on its own
  bionic/linker: change the buddy allocator to take a handle to the managed area