214dec2811
Merge commit '7e7d6c48a064af82f0ec39f47b9eb803a6e1df4c' into eclair-plus-aosp * commit '7e7d6c48a064af82f0ec39f47b9eb803a6e1df4c': use local symbols in memset so it doesn't screw up profiling