tree 48fa4350a0d03db523d4e76de535183e4a966c87
parent 641e43824128c7a81d209dc90170bcae04645c16
parent 9ade14663b97581a4297047e359ca1cae9ac8399
author Elliott Hughes <enh@google.com> 1416524708 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416524708 +0000

am 9ade1466: Merge "Remove generic/mips no-op."

* commit '9ade14663b97581a4297047e359ca1cae9ac8399':
  Remove generic/mips no-op.