tree c8545cb35c5b8b7b3d941d35eeb08ae8c7c1f89f
parent 141ce6063c2f7463d9302646cfaa635677e9e439
parent 9f34b141b301f15111de2ff0efb3d76379b46f1c
author Colin Cross <ccross@android.com> 1387491171 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387491171 +0000

am 9f34b141: am 85d5d611: am c4f4e5e2: am cd8b953e: Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd

* commit '9f34b141b301f15111de2ff0efb3d76379b46f1c':
  libion: update to latest uapi header
  libion: return -errno from ion_close
  libion: add include for size_t
  libion: add NULL checks
  libion: clean up whitespace
  libion: move ion.h into local include directory