tree 80a1af916c4e30ae2f9e23d62fa0dc4e657a59ab
parent 1943f2b18719c3e797c20a4033929245c93b73f6
parent 72c6dc314ed2ecf0bc559d1aef73d01edb053a52
author Ying Wang <wangying@google.com> 1280950837 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280950837 -0700

am 72c6dc31: am 45c4b171: Build static libstlport.

Merge commit '72c6dc314ed2ecf0bc559d1aef73d01edb053a52' into gingerbread-plus-aosp

* commit '72c6dc314ed2ecf0bc559d1aef73d01edb053a52':
  Build static libstlport.