OSDN Git Service

am f0073a99: Use STLPort instead of our stripped version. DO NOT MERGE.
authorJean-Baptiste Queru <jbq@google.com>
Wed, 3 Mar 2010 21:40:16 +0000 (13:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Mar 2010 21:40:16 +0000 (13:40 -0800)
Merge commit 'f0073a99fda2bf1acd49fa66d0dd4272d09a1e61' into eclair-mr2-plus-aosp

* commit 'f0073a99fda2bf1acd49fa66d0dd4272d09a1e61':
  Use STLPort instead of our stripped version. DO NOT MERGE.


Trivial merge