tree 7cc269eadcd1618bf4ee69d53189395a03e0f188
parent 7a64e3a6f3e9f4de9cb097f604187d06268c23be
parent 27827bab181b332387b6a043df430c7b1243c507
author Irfan Sheriff <isheriff@google.com> 1286738511 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1286738511 -0700

Merge "fix getmacaddress race condition (don't auto-merge)" into gingerbread