tree a9760725a64ff5d6af39df44f1fee4de6f2b32d2
parent 03b10c268b810c06e31f20fab00ee9bb93d09d01
parent bf6acf44a9ac1754ec5089ec8370537ff37e5af3
author Jeff Sharkey <jsharkey@android.com> 1449162097 +0000
committer android-build-merger <android-build-merger@google.com> 1449162097 +0000

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

* commit 'bf6acf44a9ac1754ec5089ec8370537ff37e5af3':
  vold: fix 64 bit ioctl error