Jean-Baptiste Queru 75bcd73777 am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge ... * commit '4ddcb75861cfb2835fcc20f2071222d2f55450ba':		2013-03-11 12:41:50 -07:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	bugreport: Add /proc/interrupts dump	2012-11-07 11:09:46 -08:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	DO NOT MERGE GraphicBufferAllocator: make frees async	2012-12-07 10:32:13 -08:00
libs	[DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees	2012-12-10 17:19:37 -08:00
opengl	Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev	2012-11-27 07:36:50 -08:00
services	make transform hint multi-display aware	2012-11-21 16:03:52 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00