Sreeram Ramachandran 3b6c705157 am a055fd35: resolved conflicts for merge of 0d2bee0c to lmp-dev-plus-aosp ... * commit 'a055fd358bd64f5d49e7957fc8aeb83b170787e9':		2014-07-14 18:01:55 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	dump bluedroid kernel status	2014-07-11 13:58:17 -07:00
data/etc	Add HDMI-CEC feature xml.	2014-07-11 15:37:33 +09: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	Fix more syntax not allowed by -std=c++11	2014-07-13 22:08:08 -07:00
MODULE_LICENSE_APACHE2
NOTICE