tree 6bc77b2a90b3d34f1a245e8046f142c9a83950b8
parent 757b7f7d8917b43c77e43b5653e7674417ba298f
parent adb14248ea2a0e60a5a8bb0ff1adac2fde2a3c46
author Jean-Baptiste Queru <jbq@google.com> 1296519414 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296519414 -0800

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

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