The Android Automerger 70adb800fb merge in lmp-release history after reset to b1f0f288e3		2014-08-19 06:11:27 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	atrace: add memory reclaim tracing	2014-08-18 17:48:16 -07:00
data/etc	Add OpenGL ES AEP feature xml.	2014-07-18 14:25:39 -07:00
include	Shelve InputFlinger for another release. DO NOT MERGE	2014-08-18 10:17:18 -07:00
libs	Shelve InputFlinger for another release. DO NOT MERGE	2014-08-18 10:17:18 -07:00
opengl	Revert "Modify EGL to disconnect the window when the surface gets destroyed."	2014-08-08 10:30:44 -07:00
services	Shelve InputFlinger for another release. DO NOT MERGE	2014-08-18 10:17:18 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00