tree ab6c66050225288f9c4074975010e4828b88fb71
parent ddadfd116433f2c4300dd22600c9bf572b2eb1c1
parent 081768d3a6d94b13d30cb7b9684fe76b0b6ba732
author Ben Cheng <bccheng@google.com> 1361301446 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361301446 -0800

am 081768d3: (-s ours) Merge "DO NOT MERGE: Add missing ioctl wrappers for Nexus 10."

* commit '081768d3a6d94b13d30cb7b9684fe76b0b6ba732':
  DO NOT MERGE: Add missing ioctl wrappers for Nexus 10.