Mathias Agopian 438ca07b6b Merge changes I66511c08,Ia051949f,Ic7451365,I5b571a4c into jb-mr2-dev ... * changes: Get rid of LayerBase. Make LayerDim a regular Layer instead of a LayerBase fold LayerBaseClient into LayerBase Remove support for ScreenshotLayer		2013-03-07 01:47:34 +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	Remove support for ScreenshotLayer	2013-03-05 19:52:29 -08: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 changes I66511c08,Ia051949f,Ic7451365,I5b571a4c into jb-mr2-dev	2013-03-07 01:47:34 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00