am c080bc54: am fbd7ae7a: am 201cd466: remove shadowed variable declaration
am c080bc54: am fbd7ae7a: am 201cd466: remove shadowed variable declaration

Merge commit 'c080bc549aaf272c77fe7903e52c2a2c0d8de1bb'

* commit 'c080bc549aaf272c77fe7903e52c2a2c0d8de1bb':
  remove shadowed variable declaration

76Demented/bootable_recovery-,kylinmoddev/android_bootable_recovery,DerTeufel/dualboot_recovery,InsomniaAOSP/platform_bootable_recovery,randomblame/bootable_recovery,DerTeufel/dualboot_recovery,kylinmoddev/android_bootable_recovery,InsomniaAOSP/platform_bootable_recovery,76Demented/bootable_recovery-,randomblame/bootable_recovery,randomblame/bootable_recovery,Plain-Andy/android_platform_bootable_recovery,76Demented/bootable_recovery-,kylinmoddev/android_bootable_recovery,InsomniaAOSP/platform_bootable_recovery,DerTeufel/dualboot_recovery,randomblame/bootable_recovery,76Demented/bootable_recovery-,InsomniaAOSP/platform_bootable_recovery,Plain-Andy/android_platform_bootable_recovery,kylinmoddev/android_bootable_recovery,Plain-Andy/android_platform_bootable_recovery,InsomniaAOSP/platform_bootable_recovery,DerTeufel/dualboot_recovery,DerTeufel/dualboot_recovery,76Demented/bootable_recovery-,Plain-Andy/android_platform_bootable_recovery,randomblame/bootable_recovery