| commit | 297882c08ef66ebf930290d4a954c7b388a669d5 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Mon Oct 11 10:49:39 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 11 10:49:39 2010 -0700 |
| tree | bab5ec90cf3b26ed89a28ff4ff2a327bc0260fff | |
| parent | 017a46f5dab098d0afb582d997ddca697883624d [diff] | |
| parent | e843dea8e8156878bd8a9b061181ce1da8ad59c9 [diff] |
am e843dea8: (-s ours) am 7efff5c4: Merge "fix getmacaddress race condition (don\'t auto-merge)" into gingerbread Merge commit 'e843dea8e8156878bd8a9b061181ce1da8ad59c9' * commit 'e843dea8e8156878bd8a9b061181ce1da8ad59c9': fix getmacaddress race condition (don't auto-merge)