Jamie Gennis 333fb79753 Merge "native_fence_sync: fix an enum name"		2012-11-26 14:12:12 -08:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	Switch keystore to binder	2012-11-14 15:42:38 -08:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	SurfaceFlinger: refactor frame time tracking	2012-11-19 17:45:09 -08:00
libs	Merge "SurfaceFlinger: refactor frame time tracking"	2012-11-20 12:20:52 -08:00
opengl	Merge "native_fence_sync: fix an enum name"	2012-11-26 14:12:12 -08:00
services	SurfaceFlinger: refactor frame time tracking	2012-11-19 17:45:09 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00