Doug Zongker cfcec9e1d4 Merge commit 'ea868b38' into manualmerge ...

Conflicts:
	screen_ui.cpp
	screen_ui.h

Change-Id: Iefe7dde04cc76639f56730a19238436073f18ffb

2014-03-13 08:44:07 -07:00

..

erasing_text.png

tweak recovery text images

2012-09-18 14:52:18 -07:00

error_text.png

tweak recovery text images

2012-09-18 14:52:18 -07:00

icon_error.png

revert to tacky 3D recovery animation

2012-10-08 08:38:16 -07:00

icon_installing.png

change how recovery animation is implemented

2014-03-11 14:06:35 -07:00

installing_text.png

tweak recovery text images

2012-09-18 14:52:18 -07:00

no_command_text.png

tweak recovery text images

2012-09-18 14:52:18 -07:00

progress_empty.png

change recovery images to match blue holo theme

2011-08-19 16:56:31 -07:00

progress_fill.png

change recovery images to match blue holo theme

2011-08-19 16:56:31 -07:00

stage_empty.png

add the functions for multi-stage packages to updater

2013-11-26 15:46:57 -08:00

stage_fill.png

add the functions for multi-stage packages to updater

2013-11-26 15:46:57 -08:00