diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-02-10 14:41:43 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-10 14:41:43 -0800 |
| commit | 37a032dbe5bda45105139803c4745deb19db0d42 (patch) | |
| tree | 6bc77b2a90b3d34f1a245e8046f142c9a83950b8 | |
| parent | 59df541c9898b6acf1fc8ce8436f275e92d4813e (diff) | |
| parent | b7ea0d41e1739f610d1e7bd8e7eb2fe600196a4c (diff) | |
| download | glib-37a032dbe5bda45105139803c4745deb19db0d42.tar.gz | |
am b7ea0d41: (-s ours) am 16a8c02e: (-s ours) am 2e9a8b3e: (-s ours) Merge "disable prelinking - do not merge"android-sdk-3.1_r1android-3.2_r1android-3.2.4_r1android-3.2.2_r2android-3.2.2_r1android-3.2.1_r2android-3.2.1_r1android-3.1_r1
* commit 'b7ea0d41e1739f610d1e7bd8e7eb2fe600196a4c':
disable prelinking - do not merge
0 files changed, 0 insertions, 0 deletions