resolve merge conflicts of 216bff9ff3 to mnc-dr-dev.

Change-Id: I63c4f3a4e56f30d6f476ad2c623c23ee7e1a3778
This commit is contained in:
Andreas Gampe 2015-10-22 22:15:26 -07:00
commit 807032d0e1

View File

@ -32,6 +32,6 @@
#define __unlockenv() 0
#include <stddef.h>
int reallocarr(void*, size_t, size_t);
__LIBC_HIDDEN__ int reallocarr(void*, size_t, size_t);
#endif