Narayan Kamath 37764c71a0 Cherry pick parts of f5df700e6ce. ... This is logically a part of the merge conflict resolution for 22d07464 to master. These files moved across git repositories. Change-Id: Id95bfa0bf503295f2c02a201f4bec5243d169ec4		2014-03-27 14:27:42 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 5d58e309: am 1bf30245: Merge "Extend installd to support SELinux restorecon function."	2014-03-19 20:41:51 +00:00
data/etc	Add device admin to wearables for API8 Compat	2014-03-17 12:19:18 -07:00
include	Merge "batteryservice: Add battery capacity"	2014-03-20 18:11:10 +00:00
libs	BufferQueue: Set attached buffers as requested	2014-03-24 15:03:46 -07:00
opengl	Request RGBX rather than RGBA	2014-03-25 14:59:26 -07:00
services	Cherry pick parts of f5df700e6ce.	2014-03-27 14:27:42 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00