commit | 286ab6ce08acb5585ccc02ddf54d7654118fe11b | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Tue Dec 17 21:22:16 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 17 21:22:16 2013 +0000 |
tree | ddacc3443057cb54b9c00ea5829c01d9792bbf44 | |
parent | 980093ca5923d2a3a69075ca156c4b90e0ea6d39 [diff] | |
parent | 3278af85f984a1b6df56b010a93589f6068514e0 [diff] |
am 3278af85: am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t" * commit '3278af85f984a1b6df56b010a93589f6068514e0': libdiskconfig: Use uintptr_t instead of uint32_t