tree fa3baa194244874d4db40b517788a73729819a00
parent 59e9a496b4341fd2b11d4a01544bf7edf3d00cc5
parent 646e058136d59671d5d32d93bedbb71004a9ce73
author Elliott Hughes <enh@google.com> 1360268860 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1360268860 +0000

Merge "Fix x86 build, remove void* arithmetic."