tree 088fc2833b64c436cebd99a8b8447b7739737483
parent 430e26f94a583acae1531a59a48e2cf07893c9b8
parent 3a7a4696f24b73740ade58d9fb71f9dfb0be5c58
author Stephen Hines <srhines@google.com> 1387572687 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387572687 -0800

am 3a7a4696: Merge "Replace "mips" with "mipmaps" since the MIPS gcc compiler defines mips to 1."

* commit '3a7a4696f24b73740ade58d9fb71f9dfb0be5c58':
  Replace "mips" with "mipmaps" since the MIPS gcc compiler defines mips to 1.