Jean-Baptiste Queru 5c19de4d07 am 1d6e52d1: am 50d36d58: am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge ... * commit '1d6e52d17e2df913e10925c5e3e652d3421ff320':		2013-03-11 13:44:33 -07:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	am ba8abb51: Merge "Ensure dumpstate children die"	2013-03-11 12:28:06 -07:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	rename binder services main thread to Binder_*	2013-03-07 15:34:28 -08:00
libs	add two libgui tests	2013-03-08 13:22:03 -08:00
opengl	Merge "When disconnecting a surface, cancel don't queue the buffer" into jb-mr2-dev	2013-03-07 23:43:56 +00:00
services	make sure to call compositionComplete after taking a screenshot	2013-03-08 13:54:46 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00