Dan Stoza da03fe4bfc Merge "Allow disabling layer rotation during screenshots"		2014-02-20 00:56:34 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am b37b312b: am 7d86b454: Merge "frameworks/native: move idmap to frameworks/base"	2014-02-14 02:00:17 +00:00
data/etc	Add new software features	2014-02-05 19:35:57 +00:00
include	am 44c35ec4: Allow "opaque" flag to be updated. DO NOT MERGE	2014-02-18 23:59:43 +00:00
libs	Merge "Allow disabling layer rotation during screenshots"	2014-02-20 00:56:34 +00:00
opengl	Merge "Hide three malformed GL bindings"	2014-02-19 19:15:20 +00:00
services	Allow "opaque" flag to be updated. DO NOT MERGE	2014-02-18 15:55:42 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00