tree 39fcbe6db6f065101074c98da8970a83d4df0d4b
parent 188232d740630b6b5ab16b22961eeea8483b5fd8
parent 98743d2b3d1df3c9937c89d7fdb3952558f61330
author Stephen Hines <srhines@google.com> 1345750483 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345750483 -0700

am 98743d2b: (-s ours) am f2bc81da: (-s ours) am fd729de5: (-s ours) Merge "DO NOT MERGE - Fix stale realloc pointers."

* commit '98743d2b3d1df3c9937c89d7fdb3952558f61330':
  DO NOT MERGE - Fix stale realloc pointers.