tree 5b0ed26efb656b3f2e4f0bd60be536087b63db69
parent 3435485164552723d27b7ea0273b7c324d799108
parent 5348c014129b766d621ef82a6e42007009ffc310
author Brad Fitzpatrick <bradfitz@android.com> 1269548535 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1269548535 -0700

Merge "Better fix for gettid() sim-eng breakage from last night."