Michael Lentine 784fd39a19 resolved conflicts for merge of d6308379 to lmp-dev ... Change-Id: I92ed61b6fdfe458cf5f8bfd6f0b37ff736280500		2014-12-02 11:15:56 -08:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Migrate CA certificates to all users	2014-10-15 19:04:33 +00:00
data/etc	am 60d31a0f: am 3c648e37: Update comment to use correct GPS file for wearable.	2014-09-19 22:02:37 +00:00
include	media: add kMetadataBufferTypeGraphicBuffer	2014-10-13 22:58:03 -07:00
libs	resolved conflicts for merge of d6308379 to lmp-dev	2014-12-02 11:15:56 -08:00
opengl	Add rate-limited logging for unimplemented es functions.	2014-09-23 08:30:12 -07:00
services	surfaceflinger: don't close fence fds after passing to queueBuffer	2014-10-21 11:11:53 -07:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00