Merge commit '7efff5c4c571d1a0111e31d73a87d27e1fae9de6' into gingerbread-plus-aosp * commit '7efff5c4c571d1a0111e31d73a87d27e1fae9de6': fix getmacaddress race condition (don't auto-merge)
Merge commit '7efff5c4c571d1a0111e31d73a87d27e1fae9de6' into gingerbread-plus-aosp * commit '7efff5c4c571d1a0111e31d73a87d27e1fae9de6': fix getmacaddress race condition (don't auto-merge)