Justin Ho 5fc16d4668 am e46f8696: am b09f6f96: Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1 ... * commit 'e46f869629ef27afb149c771e69dbbefe1135f33': Update WiMAX assets to match new style Bug: 5724605		2012-01-23 09:18:30 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	Merge "Fix compilation with Clang."	2012-01-13 15:16:59 -08:00
libs	Get AID_GRAPHICS from right place	2012-01-13 13:45:39 -08:00
opengl	gltrace: fixup data for glTexSubImage2D & glDeleteBuffers	2012-01-17 12:28:11 -08:00
services/surfaceflinger	Get AID_GRAPHICS from right place	2012-01-13 13:45:39 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00