am e843dea8: (-s ours) am 7efff5c4: Merge "fix getmacaddress race condition (don\'t auto-merge)" into gingerbread

Browse Source

Merge commit 'e843dea8e8156878bd8a9b061181ce1da8ad59c9'

* commit 'e843dea8e8156878bd8a9b061181ce1da8ad59c9':
  fix getmacaddress race condition (don't auto-merge)

...

This commit is contained in:

Irfan Sheriff

2010-10-11 10:49:39 -07:00

committed by Android Git Automerger

parent 017a46f5da e843dea8e8

commit 297882c08e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available