| commit | 10f2093f3b0dea094f55bab4b4759bbfbbfbf7cd | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Dec 16 18:35:52 2010 -0800 |
| committer | Elliott Hughes <enh@google.com> | Thu Dec 16 19:09:51 2010 -0800 |
| tree | c27e1cd94e124ea5e0e49e3fb3011c5f52eb87ac | |
| parent | 55930b5ffd8d00c6d9c8b7c5d99134f2093c6aa7 [diff] | |
| parent | d4a65d28d4dd7dab4ad66d2d65903296d183d47c [diff] |
Merge remote branch 'goog/master' into mm Plus a hack in cpu-features.h to avoid errors like this: bionic/libc/arch-arm/bionic/strcpy.S: Assembler messages: bionic/libc/arch-arm/bionic/strcpy.S:42: Error: bad instruction `pld(r1, #0)' (The alternative would probably have been to pull in the build change that defines __ASSEMBLY__, but I don't want to do any more than necessary.) Change-Id: Idad9665eb8cf5ef6a093c85d3098d11a37f5ac6a