tree e1c4b46396275be44634ed090e0b2f867c8f48bc
parent fb1d992f4b8addad729a94cb006a732a40b62756
parent cd767bfd1c8e3103f99207ecfa34385e76518e82
author Iliyan Malchev <malchev@google.com> 1257203224 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257203224 -0800

am cd767bfd: am d4649b2f: Merge change Ibaef6141 into eclair

Merge commit 'cd767bfd1c8e3103f99207ecfa34385e76518e82' into eclair-mr2-plus-aosp

* commit 'cd767bfd1c8e3103f99207ecfa34385e76518e82':
  libbinder: add a NO_CACHING flag to MemoryHeapBase