tree c90d3a848663402c9d77db36088aeb09fa236095
parent 8101125ee5068aff91f98c042660cb29576b8612
parent c080bc549aaf272c77fe7903e52c2a2c0d8de1bb
author Doug Zongker <dougz@android.com> 1281969891 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281969891 -0700

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

Merge commit 'c080bc549aaf272c77fe7903e52c2a2c0d8de1bb'

* commit 'c080bc549aaf272c77fe7903e52c2a2c0d8de1bb':
  remove shadowed variable declaration