commit | ff67ed65b8d22c54b1907f2df9a690d580a9ef7b | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Fri Jun 17 08:24:53 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 17 08:24:53 2011 -0700 |
tree | 4dc82a7ae5c1ff0fb79155f125c3d471c8755ef9 | |
parent | 3305a5af5398c66a074d2e329ac093f288e692f5 [diff] | |
parent | 5e2e09c569092dcc19f9646060cc1c33266eb213 [diff] |
am 5e2e09c5: (-s ours) am ee803184: am f771489d: Merge "Tweak prelink map, more" * commit '5e2e09c569092dcc19f9646060cc1c33266eb213': Tweak prelink map, more