tree 89e999996a20029ff8b4031a2ed8a54534013156
parent 036bf65a9f295562a0e99a36683454323c4639b2
parent 7a39094465bbd01a22565fce1f1155c762f8d145
author Dan Albert <danalbert@google.com> 1400543286 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1400543286 +0000

Merge "Revert "Removes bionic's dependence on stlport""