tree 2b4dcb33bb8eb1c5451fd957c16332d570df8654
parent 0ec050af98e7e3e60d0b5a2a98a5b1c381b7f77c
parent 45c4b1710d150a1adbf9d5d405f143164c0011b0
author Ying Wang <wangying@google.com> 1280950342 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280950342 -0700

am 45c4b171: Build static libstlport.

Merge commit '45c4b1710d150a1adbf9d5d405f143164c0011b0' into gingerbread

* commit '45c4b1710d150a1adbf9d5d405f143164c0011b0':
  Build static libstlport.