tree 75a54e7cb8c0e3b9ba09c7f9fa9a32d79d9e7113
parent 784b6181cfd2a0362f35d32ee62a98ab60437397
parent c47aa3bd2acde49f858b21bcafd750b2981df7c0
author Christopher Ferris <cferris@google.com> 1391388302 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391388302 +0000

am c47aa3bd: Merge "Fix mips build."

* commit 'c47aa3bd2acde49f858b21bcafd750b2981df7c0':
  Fix mips build.