tree 0fe65e6eb2f79f7ea3e60acfdcaaba0385dfef14
parent a56ab4b00fe898a1d7768c1d3023fc998c7867b5
parent ec531e5cdde5e0b120bd88aeb2c3d36d18cedfb4
author Elliott Hughes <enh@google.com> 1406659373 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406659373 +0000

am ec531e5c: am 47a12389: Merge "Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break."

* commit 'ec531e5cdde5e0b120bd88aeb2c3d36d18cedfb4':
  Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break.