tree 68815d0a3d43742a536335810bce3bc102eccf45
parent 15f2d9da80d3f0522ffcaeaac4365bf400c06d3b
parent 63d2f6db2e13aefb7802f13d597d47583897df6d
author Sudhir Sharma <sudhshar@codeaurora.org> 1425985864 -0700
committer Sudhir Sharma <sudhshar@codeaurora.org> 1425985864 -0700
mergetag object 63d2f6db2e13aefb7802f13d597d47583897df6d
 type commit
 tag android-5.1.0_r1
 tagger The Android Open Source Project <initial-contribution@android.com> 1425313566 -0800
 
 Android 5.1.0 release 1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlT0jx4ACgkQ6K0/gZqxDnimcgCeI4NOA9gpRaW/HL6POI9gLVzy
 jmcAnjuqmiIFHgE5XUrUx7x5c4L1+hgL
 =cYrV
 -----END PGP SIGNATURE-----

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