The Android Automerger 9c7aafad6e merge in master-release history after reset to 2f9a3e73bf		2014-05-14 05:50:47 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 449e0dbe: am fc1b9fa3: am b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when created."	2014-05-13 20:41:41 +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 47d871b2: am d35e3af0: Set default values for FifoMaxEventCount and ReservedEventCount.	2014-05-13 00:54:50 +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