tree 9919ac96cda3f52966a4082b8cbaf0b17d159774
parent 348856fadb03cd0d93d0af3f78c11555a343e97f
parent 30f9b5092062a0c8b61356496128feaaf8cd4237
author Elliott Hughes <enh@google.com> 1387315182 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387315182 -0800

am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"

* commit '30f9b5092062a0c8b61356496128feaaf8cd4237':
  libdiskconfig: Use uintptr_t instead of uint32_t