| commit | 7efff5c4c571d1a0111e31d73a87d27e1fae9de6 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Sun Oct 10 12:21:51 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Oct 10 12:21:51 2010 -0700 |
| tree | 7cc269eadcd1618bf4ee69d53189395a03e0f188 | |
| parent | 7a64e3a6f3e9f4de9cb097f604187d06268c23be [diff] | |
| parent | 27827bab181b332387b6a043df430c7b1243c507 [diff] |
Merge "fix getmacaddress race condition (don't auto-merge)" into gingerbread