tree ae92c18485a04075e3824b676e811ca3d0b1b3e8
parent bdeb67fdee6256391a5ad3cf8dfe65b364e54038
parent 796aaf7fb160fea12bddc8406d7f006ce811eb43
author Anh Nguyen <anguyen@codeaurora.org> 1425967499 -0700
committer Anh Nguyen <anguyen@codeaurora.org> 1425967499 -0700
mergetag object 796aaf7fb160fea12bddc8406d7f006ce811eb43
 type commit
 tag android-5.1.0_r1
 tagger The Android Open Source Project <initial-contribution@android.com> 1425313594 -0800
 
 Android 5.1.0 release 1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlT0jzoACgkQ6K0/gZqxDnj/CQCfeAjtlypCvyRoREqbzBMvoBps
 TBoAoIUe7MG0cLASb/hpKHMXoP5xpuUS
 =W+SQ
 -----END PGP SIGNATURE-----

Merge tag 'android-5.1.0_r1' into HEAD

Android 5.1.0 release 1

Conflicts:
	cmds/atrace/atrace.cpp
	include/media/openmax/OMX_Audio.h
	services/surfaceflinger/Layer.cpp
	services/surfaceflinger/Layer.h
	services/surfaceflinger/SurfaceFlinger.cpp
	services/surfaceflinger/SurfaceFlinger.h

Change-Id: I090bc3c6d46cb853289b449b2e5f234ff950437d