commit | 142f2d34bc8c1249c152934de18d11767d03fb68 | [log] [tgz] |
---|---|---|
author | Stephen Hines <srhines@google.com> | Fri Dec 20 20:56:59 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 20 20:56:59 2013 +0000 |
tree | 088fc2833b64c436cebd99a8b8447b7739737483 | |
parent | 37e84e3bb8a93ef45bc70ed905c3edbecc006bd4 [diff] | |
parent | f46cf902b137a8ac7d67e74ed678a0d497ffff2e [diff] |
am f46cf902: am 3a7a4696: Merge "Replace "mips" with "mipmaps" since the MIPS gcc compiler defines mips to 1." * commit 'f46cf902b137a8ac7d67e74ed678a0d497ffff2e': Replace "mips" with "mipmaps" since the MIPS gcc compiler defines mips to 1.