tree 42053e8b638e30f58773e0aec3e1b07c975f7a30
parent d709d3820586e858bab6cb8dad0c87e0f0689258
parent 15a5bffb7efc59895a92e6072717e001d2d9480c
author Robert Greenwalt <robdroid@android.com> 1254370489 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254370489 -0700

am 15a5bffb: Merge change Ie944f08b into eclair

Merge commit '15a5bffb7efc59895a92e6072717e001d2d9480c' into eclair-plus-aosp

* commit '15a5bffb7efc59895a92e6072717e001d2d9480c':
  Revert setDataEnabled to setting a master switch.