The Android Automerger 41420ae708 merge in lmp-release history after reset to 8f3b7ce889		2014-08-06 06:09:30 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Improve network connectivity dumping.	2014-07-31 01:56:12 +00:00
data/etc	Add OpenGL ES AEP feature xml.	2014-07-18 14:25:39 -07:00
include	Merge "Sensor related changes for NDK." into lmp-dev	2014-08-05 17:41:31 +00:00
libs	Sensor related changes for NDK.	2014-08-05 17:17:51 -07:00
opengl	Merge "Modify EGL to disconnect the window when the surface gets destroyed." into lmp-dev	2014-07-25 21:16:23 +00:00
services	Merge "SurfaceFlinger: Prevent deadlock by updating an atomic layer set." into lmp-dev	2014-07-29 21:36:00 +00: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