tree 4dc82a7ae5c1ff0fb79155f125c3d471c8755ef9
parent 9a708f4eeb586d0a0087c6ed08e3287dae304f43
parent 9f2e07d2c2147572edb7170206ba7ece6d42fcb5
author Jean-Baptiste Queru <jbq@google.com> 1308276232 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308276232 -0700

am 9f2e07d2: am 69ae44e2: am fd64de9a: Merge prelink map tweaks

* commit '9f2e07d2c2147572edb7170206ba7ece6d42fcb5':
  Tweak prelink map