tree 8439aca0dddd923b7bca13c4dbec3b5ddf14aa20
parent b3e68b8cb59d97ce27a99f0701484bd48acedc19
parent 142f2d34bc8c1249c152934de18d11767d03fb68
author Stephen Hines <srhines@google.com> 1387579891 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387579891 +0000

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

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