| commit | 14e81089b787731c0159fb809f8619145b3fa7d9 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Mon Apr 04 16:12:36 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 04 16:12:36 2011 -0700 |
| tree | e43ba7ee4ff9a39141b978e269a3ba081bf3b08a | |
| parent | a3689a8ba075865b3f7b8b7ddabb21622dae08f9 [diff] | |
| parent | 3f72ce2518f6f0e9ac34f1cb6ec3acd67f692313 [diff] |
am 3f72ce25: (-s ours) am 6dc4c1e7: am ca49480f: am fe98f4cf: (-s ours) DO NOT MERGE Suppress test_getHostName * commit '3f72ce2518f6f0e9ac34f1cb6ec3acd67f692313': DO NOT MERGE Suppress test_getHostName