tree 67d9b2a91b149df2389756c0226919953aac9e81
parent f67591a82724e6db92d1514855b723092bbd2e82
parent c113bc9d9f43b2ab4e64c9052efdd4e7a84cc78e
author Ben Cheng <bccheng@google.com> 1385093299 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385093299 -0800

am c113bc9d: Merge "Work around broken MIPS build"

* commit 'c113bc9d9f43b2ab4e64c9052efdd4e7a84cc78e':
  Work around broken MIPS build