The Android Automerger cbbf576cfe merge in lmp-release history after reset to 62205596b9		2014-08-20 06:11:45 -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	SensorService fixes.	2014-08-19 11:18:25 -07:00
libs	Within CpuConsumer, use gralloc lockAsync/unlockAsync	2014-08-19 19:46:10 +00:00
opengl	Revert "Modify EGL to disconnect the window when the surface gets destroyed."	2014-08-08 10:30:44 -07:00
services	Merge "Fix camera orientation by swapping horizontal and vertical flips when needed." into lmp-dev	2014-08-19 02:43:23 +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