summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2011-02-09 15:31:29 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-09 15:31:29 -0800
commit16a8c02e35da2cf8adf1a7d304a9f53851a7b151 (patch)
treeee99a5cfdd743ae700e234a7fcf0a69442c4df3f
parentadb14248ea2a0e60a5a8bb0ff1adac2fde2a3c46 (diff)
parent2e9a8b3eb3835bfdb809c0e0f420e43ace7e3a35 (diff)
downloadglib-16a8c02e35da2cf8adf1a7d304a9f53851a7b151.tar.gz
am 2e9a8b3e: (-s ours) Merge "disable prelinking - do not merge"
* commit '2e9a8b3eb3835bfdb809c0e0f420e43ace7e3a35': disable prelinking - do not merge
0 files changed, 0 insertions, 0 deletions