OSDN Git Service

Merge commit '811b0cdb2d6e4a697dbc63a678712759dd0db242' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 22 Nov 2013 19:08:12 +0000 (11:08 -0800)
committerConley Owens <cco3@android.com>
Fri, 22 Nov 2013 21:38:33 +0000 (13:38 -0800)
commitf00c938c7f5887981d724bf2dd9989ee0af08332
tree215f86cc9ce1b1ed167d925419122327d3ffaa3e
parenta626e4d8bc3d59cc328942fc30ffc04981b154ed
parent811b0cdb2d6e4a697dbc63a678712759dd0db242
Merge commit '811b0cdb2d6e4a697dbc63a678712759dd0db242' into HEAD

Change-Id: I786944f80fb1a2d502fed51dc2c391ed5db66761
libc/Android.mk
libc/arch-arm/cortex-a15/bionic/memcpy_base.S
libc/arch-arm/krait/bionic/memcpy.S
tests/system_properties_test.cpp