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)
* commit 'cc2706542fc0fb3b54c40e173e9d08d042571660':
  Stop using stlport.


Trivial merge