Bart Sears 77f0a7535d am 875b6992: (-s ours) am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 ... * commit '875b69928193e464243cf491bfe861f30644e9b4': Do not allow file:// access when it is disabled. Do not merge.		2012-01-04 21:52:04 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Add a new ui mode for "appliance"	2011-12-15 16:16:14 -08:00
libs	Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE	2012-01-03 22:38:27 +00:00
opengl	gltrace: add user settings to control data captured.	2012-01-04 12:50:13 -08:00
services/surfaceflinger	Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE	2012-01-03 22:38:27 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00