Mathias Agopian 9a86704c22 Merge "get rid of Surface identity and token"		2013-02-14 20:24:37 +00:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	atrace: add HAL tag	2013-02-13 15:30:31 -08:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	get rid of Surface identity and token	2013-02-13 15:27:08 -08:00
libs	get rid of Surface identity and token	2013-02-13 15:27:08 -08:00
opengl	am 45b0e435: Merge "Simplify OpenGL TLS access on ARM."	2013-02-14 11:42:06 -08:00
services	get rid of Surface identity and token	2013-02-13 15:27:08 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00