tree 8c572d543f66fd089c10e336a3f059805e617627
parent 4a96142c455af4bc78aca1d152995c36bc75a9e9
parent e07a6e6337a959c45ab71acf6ff1fad8a8ac5dfd
author Elliott Hughes <enh@google.com> 1407274996 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407274996 +0000

am e07a6e63: am 6d9a5ac3: Merge "[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6"

* commit 'e07a6e6337a959c45ab71acf6ff1fad8a8ac5dfd':
  [MIPSR6] Skip pixelflinger, memset assembler code on mips32r6