
Fixing merge conflict and pulling in all of the changes that I stupidly marked as not requiring a merge. Conflicts: libc/arch-arm/arm.mk libc/arch-arm/cortex-a15/bionic/memcpy.S libc/arch-arm/cortex-a15/bionic/memset.S libc/arch-arm/cortex-a9/bionic/memcpy.S libc/arch-arm/cortex-a9/bionic/memset.S libc/arch-arm/cortex-a9/cortex-a9.mk libc/arch-arm/krait/bionic/memcpy.S libc/arch-arm/krait/bionic/memset.S libc/arch-arm/krait/krait.mk Change-Id: I5da280dd8700681f118719c964a4d13446db51db
Description
No description provided
Languages
C
68.1%
Assembly
16.2%
C++
13.4%
Makefile
1.1%
Python
0.9%
Other
0.2%