commit | 4a9dd2dc4a22d900d7d5d9dc5f8f9f27c3f3b871 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Fri Jun 17 12:46:29 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 17 12:46:29 2011 -0700 |
tree | 4dc82a7ae5c1ff0fb79155f125c3d471c8755ef9 | |
parent | ff67ed65b8d22c54b1907f2df9a690d580a9ef7b [diff] | |
parent | af1b618c0d0ed2c36acebefe8cd1b38eea17c9ef [diff] |
am af1b618c: (-s ours) am c5e5d989: am 9d7590b9: Merge "Tweak prelink map" * commit 'af1b618c0d0ed2c36acebefe8cd1b38eea17c9ef': Tweak prelink map