Jean-Baptiste Queru 1d6e52d17e am 50d36d58: am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge ... * commit '50d36d58369cdf48bc6fcdba96b36c846be8587a':		2013-03-11 13:13:37 -07:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	Ensure dumpstate children die	2013-03-11 11:44:15 -05:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Tweaks for forward compatibility	2013-03-06 15:26:54 -08:00
libs	am 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees	2012-12-10 17:58:33 -08:00
opengl	Simplify OpenGL TLS access on ARM.	2013-02-13 17:30:54 -08:00
services	am 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"	2013-01-14 14:34:15 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00