tree 4e4f65f8279dcb1a91fe2b957839b707f74b35f3
parent dfd58ba54e4a4e5d3a5aa2527a9e48b344f37894
parent df5c798f368bc16a858281b4d5d0ecc2b7040cfe
author Ying Wang <wangying@android.com> 1431620793 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431620793 +0000

am df5c798f: Merge "[MIPS] Temporarily disable Mips shared-textrel errors"

* commit 'df5c798f368bc16a858281b4d5d0ecc2b7040cfe':
  [MIPS] Temporarily disable Mips shared-textrel errors