tree abc4d0bded11d2e847b3e8c2d0f40ec0f67d1a01
parent 98fdcfa9817bf54a8695c57366f4ff047ceddb85
parent dfe747ada3ec58d104d0ea57bf4f86692cd8a4fe
author Colin Cross <ccross@android.com> 1387488104 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387488104 -0800

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

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