| commit | 4c323f8a0dc77cccc10310a0509b52e8aba221ef | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Mar 03 14:53:45 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 03 14:53:45 2010 -0800 |
| tree | 13fdfec2b5615e2b3d3d184fa8c59c316c9b090a | |
| parent | cea5524c88df97da35e23cd82d0b0ef363403e13 [diff] | |
| parent | fa65eb8a4fe0c48e4c8630850b2492051e5adf5a [diff] |
am fa65eb8a: (-s ours) am 9a77bf56: Revert "Use STLPort instead of our stripped version." DO NOT MERGE. Merge commit 'fa65eb8a4fe0c48e4c8630850b2492051e5adf5a' * commit 'fa65eb8a4fe0c48e4c8630850b2492051e5adf5a': Revert "Use STLPort instead of our stripped version." DO NOT MERGE.