deleted:    recovery/res  conflicts with CWM Recovery

Change-Id: Ia355910828debb694442b7f97647673a0865b205
Merge "	deleted:    recovery/res  conflicts with CWM Recovery" into cm-11.0
Merge branch 'cm-11.0' into martincz