OSDN Git Service

am af1b618c: (-s ours) am c5e5d989: am 9d7590b9: Merge "Tweak prelink map"
authorJean-Baptiste Queru <jbq@google.com>
Fri, 17 Jun 2011 19:46:29 +0000 (12:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Jun 2011 19:46:29 +0000 (12:46 -0700)
commit4a9dd2dc4a22d900d7d5d9dc5f8f9f27c3f3b871
tree4dc82a7ae5c1ff0fb79155f125c3d471c8755ef9
parentff67ed65b8d22c54b1907f2df9a690d580a9ef7b
parentaf1b618c0d0ed2c36acebefe8cd1b38eea17c9ef
am af1b618c: (-s ours) am c5e5d989: am 9d7590b9: Merge "Tweak prelink map"

* commit 'af1b618c0d0ed2c36acebefe8cd1b38eea17c9ef':
  Tweak prelink map