Nick Kralevich 2b7b349b56 Merge "try to fix win_sdk build."		2013-02-02 00:09:59 +00:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	Add media.log service	2013-01-16 12:07:03 -08:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Merge "Add keycodes for brightness up/down"	2013-02-01 22:36:07 +00:00
libs	try to fix win_sdk build.	2013-02-01 16:09:23 -08:00
opengl	am 873ab60e: am 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention"	2013-02-01 14:26:21 -08:00
services	am fc866eb8: am 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"	2013-01-14 14:41:43 -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