tree 1580e8bafbe8a12d59820ef1b591b05bc093cf0b
parent c4e3200578ad670bee9f5a88e90e7a77089d5df7
parent fbd7ae7a1ce0060221241ed02c576983c1f48d34
author Doug Zongker <dougz@android.com> 1281718971 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281718971 -0700

am fbd7ae7a: am 201cd466: remove shadowed variable declaration

Merge commit 'fbd7ae7a1ce0060221241ed02c576983c1f48d34' into gingerbread-plus-aosp

* commit 'fbd7ae7a1ce0060221241ed02c576983c1f48d34':
  remove shadowed variable declaration