tree f80189072577fb0bc21516ec164c68ee98366014
parent 36b4f5b979771c0997ed4fe4d36af108aa4513b4
parent e5f45d3719275b0fd752b94c3de2e6ca8bb097bb
author Andrew Hsieh <andrewhsieh@google.com> 1352246511 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352246511 -0800

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

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