| commit | e843dea8e8156878bd8a9b061181ce1da8ad59c9 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Sun Oct 10 12:25:15 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 10 12:25:15 2010 -0700 |
| tree | 740640274d1a96f6135c2b4e8cdc8b3fa25f314d | |
| parent | 390aceaf530b40702e0b30bd51b5eef793c0ac5a [diff] | |
| parent | 7efff5c4c571d1a0111e31d73a87d27e1fae9de6 [diff] |
am 7efff5c4: Merge "fix getmacaddress race condition (don\'t auto-merge)" into gingerbread Merge commit '7efff5c4c571d1a0111e31d73a87d27e1fae9de6' into gingerbread-plus-aosp * commit '7efff5c4c571d1a0111e31d73a87d27e1fae9de6': fix getmacaddress race condition (don't auto-merge)