Sreeram Ramachandran c88da7cc21 resolved conflicts for merge of 928e05b1 to master ... Change-Id: I1d1e623a1f95baa4375a87242ce71ea789884649		2014-07-09 08:05:04 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	resolved conflicts for merge of 928e05b1 to master	2014-07-09 08:05:04 -07:00
data/etc	Add ethernet feature xml.	2014-07-08 11:38:14 -07:00
include	Fix non-portable definition of CryptoPlugin::SubSample	2014-07-01 14:54:45 -07:00
libs	Merge "BufferQueue: Add allocateBuffers method"	2014-06-27 15:56:14 +00:00
opengl	Add data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D calls.	2014-07-07 11:57:45 +01:00
services	Merge "BufferQueue: Add allocateBuffers method"	2014-06-27 15:56:14 +00:00
MODULE_LICENSE_APACHE2
NOTICE