tree b1f655666740f367cac99df6748d543e6f09dc35
parent 05324b36c1372cba6348ad5c75a96b3adfc4d9fe
parent 70bba5160f83ecd6251c4539f747ae39e9ed469c
author Iliyan Malchev <malchev@google.com> 1256348954 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256348954 -0700

am 70bba516: am 763ac283: Merge changes Ibcba4b4f,I9af341e1 into eclair

Merge commit '70bba5160f83ecd6251c4539f747ae39e9ed469c' into eclair-mr2-plus-aosp

* commit '70bba5160f83ecd6251c4539f747ae39e9ed469c':
  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