Jesse Hall 845ed8fdaa Merge "DisplayDevice: initialize mDisplayToken correctly"		2013-01-14 13:53:09 -08:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	bugreport: Add /proc/interrupts dump	2012-11-07 11:09:46 -08:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Fix build	2012-12-17 08:01:36 +08:00
libs	am 434e21bf: am 3fdeb48e: Reduce emulator logspam	2012-11-09 22:45:13 -08:00
opengl	am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"	2012-11-06 20:41:34 -08:00
services	Merge "DisplayDevice: initialize mDisplayToken correctly"	2013-01-14 13:53:09 -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