tree 07f02fd0ed9224bac2cd2f1a1ccebde9623c3450
parent 2de9c3263aa57c89ba36b88c304f9c5658bfbfb5
parent 1cd04c8275bf97407494e356ee07f1f7d38517bd
author Ben Cheng <bccheng@google.com> 1363040667 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363040667 -0700

am 1cd04c82: Merge "Add missing ioctl wrappers for Nexus 7."

* commit '1cd04c8275bf97407494e356ee07f1f7d38517bd':
  Add missing ioctl wrappers for Nexus 7.