commit | df2c97e134d6048ad3431269d64bb9516250afae | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed May 11 13:09:53 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 11 13:09:53 2011 -0700 |
tree | 5f02934b7e040354a10292c7d82da6189e657d1b | |
parent | 9be79a63709e8d034a94916f2bf4938df39fb272 [diff] | |
parent | 5db288c5e9f8969c7eabeb5b22187ae8d6618fdf [diff] |
am 5db288c5: (-s ours) am 4e1e20f5: (-s ours) Fix build - don\'t prelink glib - do not merge * commit '5db288c5e9f8969c7eabeb5b22187ae8d6618fdf': Fix build - don't prelink glib - do not merge