| commit | b7ea0d41e1739f610d1e7bd8e7eb2fe600196a4c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Feb 10 13:53:14 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 10 13:53:14 2011 -0800 |
| tree | 6bc77b2a90b3d34f1a245e8046f142c9a83950b8 | |
| parent | 85b7b818d1cd9c82d0b951aabc9242c5749a019e [diff] | |
| parent | 16a8c02e35da2cf8adf1a7d304a9f53851a7b151 [diff] |
am 16a8c02e: (-s ours) am 2e9a8b3e: (-s ours) Merge "disable prelinking - do not merge" * commit '16a8c02e35da2cf8adf1a7d304a9f53851a7b151': disable prelinking - do not merge