tree fefc2feeec19cc2cd5b7e41e4e2bb1c5885d14fe
parent f7a6ead075a9b1edc85eeeca646ced42f112f331
parent 7eaa4dc2fbc3d7b3d8a0a2576a6fc14507e176a8
author Ying Wang <wangying@google.com> 1282756213 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282756213 -0700

am 7eaa4dc2: Merge "Link against Mac OSX 10.5 SDK if building on 10.6." into gingerbread

Merge commit '7eaa4dc2fbc3d7b3d8a0a2576a6fc14507e176a8' into gingerbread-plus-aosp

* commit '7eaa4dc2fbc3d7b3d8a0a2576a6fc14507e176a8':
  Link against Mac OSX 10.5 SDK if building on 10.6.