tree b7639c745ab7b3126e93d3c8e1d41a11c62c00d6
parent 993a2bee84e25604e7ef8c1d386e7cd3904627e0
parent 2278d29ada4cda53d81b87446254cea16e1b24fa
author Elliott Hughes <enh@google.com> 1438615627 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438615627 +0000

am 2278d29a: Merge "[MIPS] Link .dex or .oat code lacking .MIPS.abiflags segment"

* commit '2278d29ada4cda53d81b87446254cea16e1b24fa':
  [MIPS] Link .dex or .oat code lacking .MIPS.abiflags segment