tree a9760725a64ff5d6af39df44f1fee4de6f2b32d2
parent cd6d8e3fb68d09122acf4272ad0f93b0f253523f
parent 3e6c59dc162ff6b16177e480fdb80c08f24b3700
author Jeff Sharkey <jsharkey@android.com> 1449161857 +0000
committer android-build-merger <android-build-merger@google.com> 1449161857 +0000

Merge "vold: fix 64 bit ioctl error"
am: 3e6c59dc16

* commit '3e6c59dc162ff6b16177e480fdb80c08f24b3700':
  vold: fix 64 bit ioctl error