tree c397b04afceb6984539512734c028520e25d3aa1
parent a6c7ec2fc2b435584adc98109976f27964d47f48
parent 17a2ab9f861eef8aea14f988487bace21c0c8e5d
author Ben Cheng <bccheng@google.com> 1361305718 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361305718 -0800

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

* commit '17a2ab9f861eef8aea14f988487bace21c0c8e5d':
  DO NOT MERGE: Add missing ioctl wrappers for Nexus 7.