Chad Jones 6ce1093b8e Merge branch 'master' of https://googleplex-android.googlesource.com/a/platform/frameworks/native		2012-11-29 14:51:39 -08:00
atrace	Add the atrace utility.	2012-02-23 15:55:31 -08:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	Merge atrace/ from platform/system/extras to cmds/atrace/	2012-11-29 14:35:18 -08:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Merge "utils: Use cutils tracing functionality."	2012-11-29 13:36:26 -08:00
libs	utils: Use cutils tracing functionality.	2012-11-29 13:33:14 -08:00
opengl	Initial draft of EGL_ANDROID_image_native_buffer	2012-11-29 11:43:47 -08:00
services	am a7da0dda: am 98cbec81: am efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev	2012-11-27 18:43:52 -08:00
MODULE_LICENSE_APACHE2
NOTICE