tree 6a01a2e7915610242fbba55971d8ce1e655c0e7a
parent 39ea00bf9dca98c655c27d8159278fb226351984
parent b1e921abf04629e8f6a9361e5f81a7d45a07a177
author Colin Cross <ccross@android.com> 1387488423 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387488423 +0000

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

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