diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-05-02 12:35:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-02 12:35:23 -0700 |
| commit | 9fabf6cdff153b00344171654cb1821903dde4e1 (patch) | |
| tree | c538066ad7ae0938340c6a4fe82af3cb2c342d96 /init.herring.rc | |
| parent | 0df9b5306074af06d7ac984641abba80b7b15bf4 (diff) | |
| parent | a68ff199ae71689a966e1b8c1a0147dc58040588 (diff) | |
| download | device_samsung_crespo-9fabf6cdff153b00344171654cb1821903dde4e1.zip device_samsung_crespo-9fabf6cdff153b00344171654cb1821903dde4e1.tar.gz device_samsung_crespo-9fabf6cdff153b00344171654cb1821903dde4e1.tar.bz2 | |
am a68ff199: (-s ours) resolved conflicts for merge of 06399ebf to honeycomb-plus-aosp
* commit 'a68ff199ae71689a966e1b8c1a0147dc58040588':
Fix dhcp on crespo
Diffstat (limited to 'init.herring.rc')
0 files changed, 0 insertions, 0 deletions