tree 82532532c7c3191e618990374525c0353f287eaa
parent 1fbc280dac0ce5089ff1491612944344af8d72b4
parent 54a4a66d38eff838d6d1fb3d0ede203aceb750c3
author Robert Greenwalt <robdroid@android.com> 1260228985 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260228985 -0800

am 54a4a66d: am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair

Merge commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3' into eclair-mr2-plus-aosp

* commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3':
  DO NOT MERGE  Reverting change I53e91db7.