tree 621b0273cda4d986f91ebbf721537893c83a21be
parent e545d511d3043b7fe14d1582ab78ebf2b0dbb8c5
parent 71bf0e82c13ac493a6e52540b9fdc86ed49ebc03
author Narayan Kamath <narayan@google.com> 1398819173 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398819173 +0000

am 71bf0e82: am a7a21819: am 20ca0a0a: Merge "config: set sizeof void pointer for LP64"

* commit '71bf0e82c13ac493a6e52540b9fdc86ed49ebc03':