| commit | b2b3f12fd712bfbe7db6b485d20a28c596f42edb | [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 | 4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f | |
| parent | 4df8ed23492d6f75ae7f3ad6d75e45a506ac1491 [diff] | |
| parent | ba18dd9fa9fde068c8aa86d01a4090b8201bf7ff [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)