Andy McFadden 9f708e1094 am 39cde06a: (-s ours) am b6601961: Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev ... * commit '39cde06aee5bc9338b1ed26513233cb54e9b446d': DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"		2014-05-09 18:00:54 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 45fcfb48: am 85453ecc: dumpstate: increase poll timeout waiting for SIGQUIT logging	2014-04-30 23:35:03 +00:00
data/etc	Add standard android.hardware.camera.external permission file.	2014-05-08 11:43:53 -07:00
include	Merge "Enable changing display configuration"	2014-05-06 21:08:16 +00:00
libs	am 114d71ce: am 214b4a61: am 8155ce81: Merge "Remove unused LOCAL_LDLIBS."	2014-05-08 18:23:58 +00:00
opengl	am 114d71ce: am 214b4a61: am 8155ce81: Merge "Remove unused LOCAL_LDLIBS."	2014-05-08 18:23:58 +00:00
services	Merge "Add "dumpsys SurfaceFlinger --dispsync""	2014-05-09 17:49:33 +00: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