tree ae4cb9c9025717ca210bc5ad2a74a71731d7296f
parent e6eb0085f1b6f32d4a9f7b75c0002e48c35d4eb1
parent faef1da288ee83a45efa906fa517b4bd93d274f6
author Andrew Hsieh <andrewhsieh@google.com> 1356331316 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1356331317 -0800

Merge "Fix a STLport-related crash."