tree 44d11fc7ae62edf0aa5c6ae0dcfe0b17f4638ff7
parent a3c2df7a9dc064289b1d8e6ab7105310e11bc654
parent 07ffc9c8b85ff720de1c560292c274ac07eba573
author Elliott Hughes <enh@google.com> 1487636750 +0000
committer android-build-merger <android-build-merger@google.com> 1487636750 +0000

Merge "Fix mips64 build" am: 669aa6239f
am: 07ffc9c8b8

Change-Id: I2f970f3761d51918fbf74bdd70d4288d99575d38