| commit | 45bd5cdc0459bbeed29db795b2754ce8df6d3b4f | [log] [tgz] |
|---|---|---|
| author | Xia Wang <xiaw@google.com> | Thu Dec 02 13:48:53 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 02 13:48:53 2010 -0800 |
| tree | d0bc6f70bc48a6d18f0ca954a3b4a5dcc2e830b6 | |
| parent | c4c53f3eaf2c6d6e312475322cd4ef606920a68b [diff] | |
| parent | 784a43fef797ca337acd07b62a9377081111cb9a [diff] |
am 5343f5a8: (-s ours) am 3591bebd: Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread * commit '5343f5a84e66cc0806d20c16b96e612e80131ac2': Restore Wi-Fi configuration after the test. DO NOT MERGE