tree 1cd4c87e3e0ec5f68315f71093c4425f657711af
parent 0e0fd6c28659387a1383a6b1c2900d481be0066d
parent 917486bb2d1e7a1fd6588eb35e7e4232e3075a93
author Ben Cheng <bccheng@google.com> 1363040668 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363040668 -0700

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

* commit '917486bb2d1e7a1fd6588eb35e7e4232e3075a93':
  Add missing ioctl used by N4 camera.