diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-02-10 13:53:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-10 13:53:14 -0800 |
| commit | b7ea0d41e1739f610d1e7bd8e7eb2fe600196a4c (patch) | |
| tree | 6bc77b2a90b3d34f1a245e8046f142c9a83950b8 | |
| parent | 85b7b818d1cd9c82d0b951aabc9242c5749a019e (diff) | |
| parent | 16a8c02e35da2cf8adf1a7d304a9f53851a7b151 (diff) | |
| download | glib-b7ea0d41e1739f610d1e7bd8e7eb2fe600196a4c.tar.gz | |
am 16a8c02e: (-s ours) am 2e9a8b3e: (-s ours) Merge "disable prelinking - do not merge"
* commit '16a8c02e35da2cf8adf1a7d304a9f53851a7b151':
disable prelinking - do not merge
0 files changed, 0 insertions, 0 deletions