The Android Automerger 3359cc00bf merge in jb-mr2-release history after reset to master		2013-02-19 09:51:24 -08:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	fix build: SurfaceTextureClient to Surface rename	2013-02-15 14:48:52 -08:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	fix build: SurfaceTextureClient to Surface rename	2013-02-15 16:34:04 -08:00
libs	Refactoring: Rename SurfaceTextureClient to Surface	2013-02-14 19:19:05 -08:00
opengl	Refactoring: Rename SurfaceTextureClient to Surface	2013-02-14 19:19:05 -08:00
services	Refactoring: Rename SurfaceTextureClient to Surface	2013-02-14 19:19:05 -08: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