tree 088fc2833b64c436cebd99a8b8447b7739737483
parent 504eb4a5e37a6feb2dbe0bcd0db9f965d8d2d426
parent 8f615d682f9e7e2cd4de2e4478e0e76fc359922c
author Stephen Hines <srhines@google.com> 1387572252 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1387572253 +0000

Merge "Replace "mips" with "mipmaps" since the MIPS gcc compiler defines mips to 1."