| commit | 16a8c02e35da2cf8adf1a7d304a9f53851a7b151 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Feb 09 15:31:29 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 09 15:31:29 2011 -0800 |
| tree | ee99a5cfdd743ae700e234a7fcf0a69442c4df3f | |
| parent | adb14248ea2a0e60a5a8bb0ff1adac2fde2a3c46 [diff] | |
| parent | 2e9a8b3eb3835bfdb809c0e0f420e43ace7e3a35 [diff] |
am 2e9a8b3e: (-s ours) Merge "disable prelinking - do not merge" * commit '2e9a8b3eb3835bfdb809c0e0f420e43ace7e3a35': disable prelinking - do not merge