tree f80189072577fb0bc21516ec164c68ee98366014
parent 30865cb901602ed078ff2ed534529d847b3b54b5
parent 881d508e7f9762cba51ac5f4c8bd99e44affa5dc
author Andrew Hsieh <andrewhsieh@google.com> 1352246117 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352246117 -0800

am 881d508e: Merge "Revert "Unbundle libstlport with NDK r4.""

* commit '881d508e7f9762cba51ac5f4c8bd99e44affa5dc':
  Revert "Unbundle libstlport with NDK r4."