The Android Automerger 152cd76544 merge in klp-release history after reset to klp-dev		2013-08-19 06:01:39 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	fix build. optional test broke.	2013-08-14 18:22:02 -07:00
data/etc	Add NFC host-based card emulation feature.	2013-07-22 16:57:17 -07:00
include	gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired	2013-08-14 20:17:17 -07:00
libs	gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired	2013-08-14 20:17:17 -07:00
opengl	Replace sRGB_888 with sRGB_X_8888	2013-08-16 07:50:11 -07:00
services	Merge "Use new HWC display type/count constants." into klp-dev	2013-08-18 04:31:24 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00