am ff67ed65: am 5e2e09c5: (-s ours) am ee803184: am f771489d: Merge "Tweak prelink map, more"

* commit 'ff67ed65b8d22c54b1907f2df9a690d580a9ef7b':
  Tweak prelink map, more
This commit is contained in:
Jean-Baptiste Queru 2011-06-17 08:33:23 -07:00 committed by Android Git Automerger
commit 856c9df4fa

Diff content is not available