tree 298084477b8db5bf03dc25a2d5e8f04428aad955
parent c1ad59a28e34319d850d5b26ab5781efed6c13c3
parent 007a71416b5f824fe7c77e53e2992a164003f37b
author Elliott Hughes <enh@google.com> 1430546984 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430546984 +0000

am 007a7141: am 4b3004a6: am 59e1e3e7: Merge "Fix mips64 minadbd_test build."

* commit '007a71416b5f824fe7c77e53e2992a164003f37b':
  Fix mips64 minadbd_test build.