The Android Open Source Project acdbbdcecb am 064d2529: (-s ours) Reconcile with jb-mr1.1-release - do not merge ... * commit '064d252918c23cc4c90f8bc62f9ae47ba7afa4d5':		2012-12-10 15:23:22 -08:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	atrace: fix the help string	2012-12-07 16:29:03 -08:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	am 2d659286: am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async	2012-12-07 10:59:29 -08:00
libs	am 50f8d285: am d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"	2012-12-07 11:09:12 -08:00
opengl	Use LOCAL_REQUIRED_MODULES to establish dependency	2012-12-04 12:04:44 -08:00
services	SurfaceFlinger: work around a driver bug	2012-12-07 15:43:02 -08:00
MODULE_LICENSE_APACHE2
NOTICE