OSDN Git Service

am 9a77bf56: Revert "Use STLPort instead of our stripped version." DO NOT MERGE.
authorJean-Baptiste Queru <jbq@google.com>
Wed, 3 Mar 2010 22:49:33 +0000 (14:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Mar 2010 22:49:33 +0000 (14:49 -0800)
Merge commit '9a77bf563cbe404d041d0df3530cb57ae67013aa' into eclair-mr2-plus-aosp

* commit '9a77bf563cbe404d041d0df3530cb57ae67013aa':
  Revert "Use STLPort instead of our stripped version." DO NOT MERGE.


Trivial merge