| commit | 9c25dc78403416e123b3450b60b21a45c874ed39 | [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 | 1b06b3ea2f9e22595b967579f0fb095a5ae3354a | |
| parent | cd023f98fab0f01603f006c3029a73cd820b4678 [diff] | |
| parent | 5343f5a84e66cc0806d20c16b96e612e80131ac2 [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