am fc76c7d3: Merge "Add missing branch in memcpy.S dst aligned case."

* commit 'fc76c7d394ebe0e585777955efadf7cc8ed86636':
  Add missing branch in memcpy.S dst aligned case.
This commit is contained in:
Christopher Ferris 2013-04-10 17:37:49 -07:00 committed by Android Git Automerger
commit 101dadf6a6

View File

@ -319,7 +319,6 @@ dst_not_word_aligned:
sub r2, r2, ip
// If src is not word aligned, jump to the unaligned code.
ands ip, r1, #0x3
beq word_aligned
// Src is guaranteed to be at least word aligned by this point.
b word_aligned
END(memcpy)