tree 177ac37c59e8e057f70fc1dd4baefd6703ffe5db
parent 5720f6fd7dcc614a0c75633a6be72a0613cf697c
parent 44925e74d5f83da540d282a0c8d77e3002e85b35
author Ben Cheng <bccheng@google.com> 1363041332 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363041332 -0700

am 44925e74: am 917486bb: Merge "Add missing ioctl used by N4 camera."

* commit '44925e74d5f83da540d282a0c8d77e3002e85b35':
  Add missing ioctl used by N4 camera.