The Android Automerger f78c42a494 merge in klp-release history after reset to klp-dev		2013-08-26 06:01:12 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	dumpstate: Fix wifi list of networks dump	2013-08-21 10:58:29 -07:00
data/etc	Add NFC host-based card emulation feature.	2013-07-22 16:57:17 -07:00
include	Remove input flinger stubs. (DO NOT MERGE)	2013-08-22 18:40:07 -07:00
libs	Remove input flinger stubs. (DO NOT MERGE)	2013-08-22 18:40:07 -07:00
opengl	only use format compatible with CPU consumers	2013-08-21 16:36:34 -07:00
services	Merge changes I34935d21,If423cd29 into klp-dev	2013-08-24 00:12:42 +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