tree acf3ddb2196b408354bb66a9aa44f6bee2ca015b
parent 530804f158e8bda105e6bbaa986e488b87af91ac
parent ff093b31d75658c3404f9b51ee45760f346f06d9
author Ian Rogers <irogers@google.com> 1398958330 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1398958331 +0000

Merge "Fix a few 64-bit compilation of 32-bit code issues."