Jamie Gennis 0e1e53e376 am 884e3bc2: (-s ours) am 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees ... * commit '884e3bc29ed190a856f7562a73548868a7ecef2f': [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees		2012-12-10 17:59:34 -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	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00