Greg Hackmann 9eb142e34a am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API"" ... * commit 'a9d49f99e69d8fc0e60b492b131322c96f47a232': Revert "Use asynchronous lock/unlock API"		2014-05-09 21:46:44 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am cb079c89: Merge "Add instruction-set arguments to installd commands."	2014-05-01 14:00:54 +00:00
data/etc	Adding PackageManager feature strings for stepcounter and stepdetector.	2013-10-13 14:53:45 -07:00
include	am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""	2014-05-09 21:46:44 +00:00
libs	am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""	2014-05-09 21:46:44 +00:00
opengl	Remove unused LOCAL_LDLIBS.	2014-05-07 15:26:38 -07:00
services	Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEAD	2014-04-29 11:34:19 -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