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)
This commit is contained in:
Irfan Sheriff 2010-10-10 12:25:15 -07:00 committed by Android Git Automerger
commit b2b3f12fd7

Diff Content Not Available