OSDN Git Service

resolved conflicts for merge of 08e72d01 to jb-dev-plus-aosp
authorIliyan Malchev <malchev@google.com>
Thu, 10 May 2012 16:19:59 +0000 (09:19 -0700)
committerIliyan Malchev <malchev@google.com>
Thu, 10 May 2012 16:19:59 +0000 (09:19 -0700)
commit8034415ddd8404f8788199ed993af89692235dc5
tree18342dbe06d1d56229eb1fb49e466b340989d331
parent804147cb7d533f5635da6adc28fbca1467a3078b
parent08e72d0161e39e99ff1003bf1ce894f37d7b7eb4
resolved conflicts for merge of 08e72d01 to jb-dev-plus-aosp

Change-Id: If00e354a5953ed54b31963d4f8ea77e1603c321e
libc/Android.mk
libc/arch-arm/bionic/memcpy.S