Nick Kralevich dbc9a47831 DO NOT MERGE: fix build try #2 am: 778b6f4902 ... am: 034bc1799c -s ours * commit '034bc1799cbbc4184aa507eba181573c0a3b9b35': DO NOT MERGE: fix build try #2		2015-10-23 04:19:51 +00: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	resolve merge conflicts of 834ac204ce to klp-modular-dev.	2015-10-23 01:44:26 +00:00
libs	add number constraint for samples per MotionEvent am: 5d17838ade	2015-10-22 02:04:55 +00: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