OSDN Git Service

am 4a9dd2dc: am af1b618c: (-s ours) am c5e5d989: am 9d7590b9: Merge "Tweak prelink...
authorJean-Baptiste Queru <jbq@google.com>
Tue, 21 Jun 2011 20:45:36 +0000 (13:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 21 Jun 2011 20:45:36 +0000 (13:45 -0700)
commit56846412a8a754dd02261c22473feeb8bd195a0f
treea1b45473de5fe46d1b7703cf457df9f0ce03f0a5
parent13fe14afe5045ae6611a2deff70bc673bd2d0f64
parent4a9dd2dc4a22d900d7d5d9dc5f8f9f27c3f3b871
am 4a9dd2dc: am af1b618c: (-s ours) am c5e5d989: am 9d7590b9: Merge "Tweak prelink map"

* commit '4a9dd2dc4a22d900d7d5d9dc5f8f9f27c3f3b871':
  Tweak prelink map