tree 6fbeb67e4de72403c3f073d2573f131f89a376cd
parent 61e4b4d5a8a948c4241c26627cf8d6cb9d0544ca
parent c9ff37144a7943ee1bc247cef3620c8cce22049d
author Colin Cross <ccross@android.com> 1378411035 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378411035 -0700

am c9ff3714: am 596e9c63: Merge "fix valgrind ioctl warning."

* commit 'c9ff37144a7943ee1bc247cef3620c8cce22049d':
  fix valgrind ioctl warning.