tree ab6c66050225288f9c4074975010e4828b88fb71
parent fdad7b033961e6caf63a1d87d000a495cfd0f15d
parent 42812ca7626df45d11ab08d53b69d4e83c9412de
author Ben Cheng <bccheng@google.com> 1361305587 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361305587 -0800

am 42812ca7: (-s ours) am 793152e1: (-s ours) Merge "DO NOT MERGE: Add missing ioctl wrappers for Nexus 7."

* commit '42812ca7626df45d11ab08d53b69d4e83c9412de':
  DO NOT MERGE: Add missing ioctl wrappers for Nexus 7.