tree 4ffa525f9e48c08dd3fbbd3b1df19d6f3bfcffe1
parent 7a7f741c358a449ca0e69f7382162f5727422e63
parent 0f3a520637421830287bb5b41f101e5f456dc4f8
author David Turner <digit@android.com> 1309963589 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309963589 -0700

am 0f3a5206: am 95d6192b: Merge "fixing bug of shadowing a variable"

* commit '0f3a520637421830287bb5b41f101e5f456dc4f8':
  fixing bug of shadowing a variable