am cc270654: Merge "Stop using stlport."
authorDan Albert <danalbert@google.com>
Mon, 17 Nov 2014 22:58:57 +0000 (22:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Nov 2014 22:58:57 +0000 (22:58 +0000)
commitfefa1fa111740916427adedd2ae6628d60562d23
tree9937a8c6fb1c1fedc0b0e2519a6657497316aa1f
parent5b35424c1bcdd48de822a6085a3bf3b1e1ac8426
parentcc2706542fc0fb3b54c40e173e9d08d042571660
am cc270654: Merge "Stop using stlport."

* commit 'cc2706542fc0fb3b54c40e173e9d08d042571660':
  Stop using stlport.