tree f6973d004da28d3bf448623ee193b9097bab4b00
parent 7f92fce427043d9904c9e52d21bc548be1d78e3c
parent 87392821575ceb19dbf92b02c8e4ded0e7dcf4fc
author Ben Cheng <bccheng@google.com> 1363040667 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363040667 -0700

am 87392821: Merge "Add missing ioctl wrappers for Nexus 10."

* commit '87392821575ceb19dbf92b02c8e4ded0e7dcf4fc':
  Add missing ioctl wrappers for Nexus 10.