tree 414e9070eff101d9ec08ad235f68c05e9d225f94
parent eeaf6544b676f68ccdd70a3fa78f44789a1bf69c
parent 7e7d6c48a064af82f0ec39f47b9eb803a6e1df4c
author Mathias Agopian <mathias@google.com> 1255997371 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255997371 -0700

am 7e7d6c48: use local symbols in memset so it doesn\'t screw up profiling

Merge commit '7e7d6c48a064af82f0ec39f47b9eb803a6e1df4c' into eclair-mr2

* commit '7e7d6c48a064af82f0ec39f47b9eb803a6e1df4c':
  use local symbols in memset so it doesn't screw up profiling