Igor Murashkin 501ca36a45 am f082323c: Merge "CpuConsumer_test: Extend test with new formats RGBA8888 and optional Y8/Y16" into jb-mr2-dev ... * commit 'f082323c0dbd915d2ad7b6f4d9c732e230fcda46': CpuConsumer_test: Extend test with new formats RGBA8888 and optional Y8/Y16		2013-03-05 21:59:03 +00:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	am 22641851: Merge "dumpstate: use correct header file."	2013-03-01 18:05:56 +00:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Merge "rework screenshot API and implementation" into jb-mr2-dev	2013-03-05 02:30:13 +00:00
libs	Merge "CpuConsumer_test: Extend test with new formats RGBA8888 and optional Y8/Y16" into jb-mr2-dev	2013-03-05 21:58:00 +00:00
opengl	Add eglPresentationTimeANDROID	2013-03-05 10:10:59 -08:00
services	Merge "rework screenshot API and implementation" into jb-mr2-dev	2013-03-05 02:30:13 +00:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00