Greg Hackmann 4b46776ff8 am 8a6cd189: am f60564a1: Merge "Use asynchronous lock/unlock API" ... * commit '8a6cd189034ec4709a66e581b41deba56c028291': Use asynchronous lock/unlock API		2014-05-09 21:13:16 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 44df726a: am cb079c89: Merge "Add instruction-set arguments to installd commands."	2014-05-01 14:05:10 +00:00
data/etc	DO NOT MERGE: Add standard android.hardware.camera.external permission file.	2014-05-08 21:48:57 +00:00
include	am 8a6cd189: am f60564a1: Merge "Use asynchronous lock/unlock API"	2014-05-09 21:13:16 +00:00
libs	am 8a6cd189: am f60564a1: Merge "Use asynchronous lock/unlock API"	2014-05-09 21:13:16 +00:00
opengl	am 214b4a61: am 8155ce81: Merge "Remove unused LOCAL_LDLIBS."	2014-05-07 23:01:19 +00:00
services	am b6601961: Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev	2014-05-09 17:57:12 +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