| commit | 417e7467703e637f384530f23850cb2bf852e61b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Dec 17 21:25:34 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 17 21:25:34 2013 +0000 |
| tree | 9919ac96cda3f52966a4082b8cbaf0b17d159774 | |
| parent | 63824e923aca6fe15942beee00b258ea6119e459 [diff] | |
| parent | 286ab6ce08acb5585ccc02ddf54d7654118fe11b [diff] |
am 286ab6ce: am 3278af85: am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t" * commit '286ab6ce08acb5585ccc02ddf54d7654118fe11b': libdiskconfig: Use uintptr_t instead of uint32_t