Mathias Agopian 743ec69e51 Merge "fix a typo in EGL loader"		2013-04-24 10:27:07 +00:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	am 9380d78c: Add new resources trace.	2013-04-12 17:06:29 -07:00
data/etc	Add hardware feature android.hardware.bluetooth.le xml file	2013-04-23 11:58:44 -07:00
include	Merge changes I0d9f18d1,Ib96c9161	2013-04-24 10:25:34 +00:00
libs	Merge changes I0d9f18d1,Ib96c9161	2013-04-24 10:25:34 +00:00
opengl	fix a typo in EGL loader	2013-04-23 14:20:16 +02:00
services	Add a --color option to dumpsys SurfaceFlinger	2013-04-22 21:51:28 +02: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