Ethan Yonker f5c2d6ce24 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

2015-03-13 13:44:21 -05:00

..

META-INF/com/google/android

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

init.rc

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

2015-03-13 13:44:21 -05:00