Merge changes Ibdc6e3c8,I9bcb91a2
authorDavid Turner <digit@android.com>
Mon, 29 Mar 2010 22:05:47 +0000 (15:05 -0700)
committerAndroid Code Review <code-review@android.com>
Mon, 29 Mar 2010 22:05:47 +0000 (15:05 -0700)
commit8ab5b02b5f58d9b2f050a98b189284a3d6263d7b
tree2f92218f958f60550990b0649011c93bf578b90a
parent87ae0da81716d61f556b1ee456a6764a1f635e55
parentbdc6e3c83f70db35603260d5c1baa8097cb765fe
Merge changes Ibdc6e3c8,I9bcb91a2

* changes:
  Correct generic memset implementation
  Generic memcpy should define MEMCOPY before including bcopy.c