tree 5a72dca707379a42ab5ed2d890eed760ddb748e3
parent 2b2f1ae86fb791e9f2fff25f93e7f2c4db010bf6
parent b81570124713939e33ff15ada36704c3409e7fe3
author Colin Cross <ccross@android.com> 1378410871 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1378410871 +0000

Merge "fix valgrind ioctl warning."