| commit | e4ed2db2f5b8df29cc7fbfadcaa3ba786346668d | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue May 19 00:50:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 19 00:50:05 2015 +0000 |
| tree | 3ac1db227e2e1076fc862e9fdb5f01ad55d02cd2 | |
| parent | ef3c0325becc5e5d8f2758a098e2cc709b78f36e [diff] | |
| parent | 8da1acf8b702665ce7891799cdbc86499533cc54 [diff] |
am 8da1acf8: am c3b58d4a: Merge "Allow goldfish-setup to put the emulator in WiFi-only mode" * commit '8da1acf8b702665ce7891799cdbc86499533cc54': Allow goldfish-setup to put the emulator in WiFi-only mode