The Android Automerger 3e80ef8614 merge in master-release history after reset to 2f3dca149a		2014-05-12 05:49:47 -07: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 9493d492: am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""	2014-05-09 22:00:04 +00:00
libs	am 9493d492: am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""	2014-05-09 22:00:04 +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