tree 36de06d1fcf9e6ba5cc92a83c757b1bddf8b0fc9
parent a0ce4e288073b744a02e4301e7ec069346c416d7
parent 949e2a7c28e61aa1ef43ce7ae59a709fb25af1af
author Colin Cross <ccross@android.com> 1387488187 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387488187 +0000

am 949e2a7c: am dfe747ad: Merge "ion: update struct and type definitions to match kernel header"

* commit '949e2a7c28e61aa1ef43ce7ae59a709fb25af1af':
  ion: update struct and type definitions to match kernel header