Greg Hackmann 9493d4924a am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API"" ... * commit '9eb142e34a5bc11508c0bd6f60ad3933c60aa530': Revert "Use asynchronous lock/unlock API"		2014-05-09 21:51:51 +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 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""	2014-05-09 21:51:51 +00:00
libs	am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""	2014-05-09 21:51:51 +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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00