commit | 52a5880fc4009778162e4e5628deeca745fde212 | [log] [tgz] |
---|---|---|
author | Simon Wilson <simonwilson@google.com> | Tue Apr 05 10:26:54 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 05 10:26:54 2011 -0700 |
tree | 1b680f23224d902d462837f6af2c73fd149d81a5 | |
parent | 42bc0e946f8b986fb3aaada9980b496172e2b511 [diff] | |
parent | 442bf4cd1efb24ea29fcc3b6b4d54f89f3a1dc7a [diff] |
am 442bf4cd: (-s ours) am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread * commit '442bf4cd1efb24ea29fcc3b6b4d54f89f3a1dc7a': DO NOT MERGE Disable WiMAX when "Data Enabled" is off