tree 0022cc15b5011d8eb5940724b3f4cb7acab2594e
parent 7e11ac5d3c345f0f1227a070a1c10eee885bcfce
parent 84e0323541bd0840e9454398df0e6923f16e6bc1
author Ethan Yonker <dees_troy@teamw.in> 1426272261 -0500
committer Ethan Yonker <dees_troy@teamw.in> 1426272261 -0500
mergetag object 84e0323541bd0840e9454398df0e6923f16e6bc1
 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/gZqxDngcFACgg0DJCO4rIVribLU1NsoS+1sc
 X3IAniYsXjskw4ZXOJcNEzJJLo6aKqCX
 =CN2I
 -----END PGP SIGNATURE-----

Merge tag 'android-5.1.0_r1' of https://android.googlesource.com/platform/bootable/recovery into aosp

Android 5.1.0 release 1

Conflicts:
	minui/graphics_fbdev.c
	recovery.cpp

Change-Id: Iff8a34fa59d93fb1165e06fef1fafd50292324f0