Andy McFadden a317f27b7b Merge "Add two new display info fields"		2014-06-17 20:55:27 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 724473b3: am 71f9956a: Merge "Fix obsolete argument name"	2014-06-17 20:05:05 +00:00
data/etc	API Review: Update managed profiles feature flag.	2014-06-05 12:57:54 +00:00
include	Add two new display info fields	2014-06-17 10:41:46 -07:00
libs	am ece62384: Merge "Remove Parcel::writeIntPtr."	2014-06-13 10:22:29 +00:00
opengl	am 0cea0a22: am d284c4cd: Merge "Don\'t set LOCAL_MODULE_PATH for native tests."	2014-06-11 17:58:44 +00:00
services	Add two new display info fields	2014-06-17 10:41:46 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00