tree 44d11fc7ae62edf0aa5c6ae0dcfe0b17f4638ff7
parent a3c2df7a9dc064289b1d8e6ab7105310e11bc654
parent 669aa6239f19447e1ee1f162189494eb1ccd787a
author Elliott Hughes <enh@google.com> 1487636509 +0000
committer android-build-merger <android-build-merger@google.com> 1487636509 +0000

Merge "Fix mips64 build"
am: 669aa6239f

Change-Id: Ie3ef0b4fe513096f521080ad3545b332992d21cd