Mike Lockwood 2fe2651df0 am 9f3f3c2f: (-s ours) am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1 ... * commit '9f3f3c2fbe23a4d9360cffc9975e5cc99f67107e': MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE		2011-12-02 17:57:19 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am 55d3880e: am bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1	2011-11-30 10:50:52 -08:00
libs	am f1a4c48b: am e21dabf6: Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1	2011-12-01 22:08:20 -08:00
opengl	Merge "glestrace: Framework for GLES tracing library"	2011-12-02 15:49:01 -08:00
services/surfaceflinger	fix an issue where updates could starve transactions	2011-12-02 16:11:19 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00