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)
* changes:
  Correct generic memset implementation
  Generic memcpy should define MEMCOPY before including bcopy.c


Trivial merge