commit | c44ab3be6a3a71fb9b79aba787310a69673a2ecb | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Thu Jun 16 17:55:42 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 16 17:55:42 2011 -0700 |
tree | 5c58effcb7fcfdef39445897f68d630d6245897f | |
parent | 6159baead8bc12ddaa0a9cb0d4885c7ce8e5155f [diff] | |
parent | 9a708f4eeb586d0a0087c6ed08e3287dae304f43 [diff] |
am 9a708f4e: am 2ba042f9: (-s ours) am 40dc95be: am 14273125: Merge "Tweak prelink map" * commit '9a708f4eeb586d0a0087c6ed08e3287dae304f43': Tweak prelink map