Colin Cross 7f5a1208e9 am 7477a8a0: am b1f0f288: Merge changes I4cfb3138,I45356c29 into lmp-dev ... * commit '7477a8a0a31f5fd7d5bf34596d7a717df60842ce': atrace: add memory reclaim tracing atrace: Add IRQ events		2014-08-19 01:59:47 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am b1f0f288: Merge changes I4cfb3138,I45356c29 into lmp-dev	2014-08-19 01:48:59 +00:00
data/etc	Add OpenGL ES AEP feature xml.	2014-07-18 14:25:39 -07:00
include	am 62fbb163: Shelve InputFlinger for another release. DO NOT MERGE	2014-08-19 01:33:52 +00:00
libs	am 62fbb163: Shelve InputFlinger for another release. DO NOT MERGE	2014-08-19 01:33:52 +00:00
opengl	am 45e2fc22: Revert "Modify EGL to disconnect the window when the surface gets destroyed."	2014-08-08 17:42:02 +00:00
services	Change output format to not throw warning on volantis.	2014-08-07 14:54:23 -07: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