tree 9b2e8bb3962db19abbfc1ba468ae998130818bda
parent f4c9fc3867a265561218d08fbbad64d017d8e93d
parent f581c1eaf398e25de8ecae69c46c698604b288f0
author Ying Wang <wangying@google.com> 1280169504 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280169504 -0700

am f581c1ea: Unbundle libstlport with NDK r4.

Merge commit 'f581c1eaf398e25de8ecae69c46c698604b288f0' into gingerbread

* commit 'f581c1eaf398e25de8ecae69c46c698604b288f0':
  Unbundle libstlport with NDK r4.