tree 6bc77b2a90b3d34f1a245e8046f142c9a83950b8
parent 37a032dbe5bda45105139803c4745deb19db0d42
parent 4e1e20f508d5a4deff8854cc9f54251f1facad81
author Jean-Baptiste Queru <jbq@google.com> 1305069679 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305069679 -0700

am 4e1e20f5: (-s ours) Fix build - don\'t prelink glib - do not merge

* commit '4e1e20f508d5a4deff8854cc9f54251f1facad81':
  Fix build - don't prelink glib - do not merge