Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 863052f2 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

am e843dea8: (-s ours) am 7efff5c4: Merge "fix getmacaddress race condition... 

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)
parents 4885054b b2b3f12f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment