| commit | d4f13d597b80fd61e02c152dc488087f7845d7e8 | [log] [tgz] |
|---|---|---|
| author | Sudhir Sharma <sudhshar@codeaurora.org> | Tue Mar 10 04:11:04 2015 -0700 |
| committer | Sudhir Sharma <sudhshar@codeaurora.org> | Tue Mar 10 04:11:04 2015 -0700 |
| tree | 68815d0a3d43742a536335810bce3bc102eccf45 | |
| parent | 15f2d9da80d3f0522ffcaeaac4365bf400c06d3b [diff] | |
| parent | 63d2f6db2e13aefb7802f13d597d47583897df6d [diff] |
Merge tag 'android-5.1.0_r1' into HEAD Android 5.1.0 release 1 Conflicts: libc/arch-arm/arm.mk libc/arch-arm/krait/bionic/memcpy_base.S Change-Id: Ia79ac57b847a5bd55818d8a7e95cc2bb39a9f570