Greg Hackmann f974bffb36 am 38c9e132: am c1ffd351: am bd20e551: Merge "Use asynchronous lock/unlock API" ... * commit '38c9e1327a5b24267c3dab5293bc9d7ada6e9fc9': Use asynchronous lock/unlock API		2014-05-12 18:18:47 +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	am 38c9e132: am c1ffd351: am bd20e551: Merge "Use asynchronous lock/unlock API"	2014-05-12 18:18:47 +00:00
libs	am 38c9e132: am c1ffd351: am bd20e551: Merge "Use asynchronous lock/unlock API"	2014-05-12 18:18:47 +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