Nick Kralevich 9ec978732f resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 ... am: fa632f6ad7 * commit 'fa632f6ad7be6b1f488dd3d1b825a82456db5097': DO NOT MERGE: fix build breakage		2015-10-23 01:52:34 +00:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	Use the timeout stack dump functions.	2015-01-14 16:58:55 -08:00
data/etc	Revert "Camera: Add XML entries and files for new system features"	2014-12-03 11:13:06 -08:00
include	resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65	2015-10-23 01:52:34 +00:00
libs	add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01	2015-10-22 02:10:12 +00:00
opengl	Remove lock around ref count check in terminate.	2015-01-28 11:54:15 -08:00
services	Revert "SurfaceFlinger: Attempt to attribute fds to layers"	2015-01-27 11:03:50 -08: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