tree 4dc82a7ae5c1ff0fb79155f125c3d471c8755ef9
parent 4c60b30542a674d6375d2cccbe90161b34e62e5a
parent 2ba042f9d86c7715cbca07e0fd417d8cf9496846
author Jean-Baptiste Queru <jbq@google.com> 1308271829 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308271829 -0700

am 2ba042f9: (-s ours) am 40dc95be: am 14273125: Merge "Tweak prelink map"

* commit '2ba042f9d86c7715cbca07e0fd417d8cf9496846':
  Tweak prelink map