The Android Automerger e54920253c merge in jb-release history after reset to master		2012-03-20 14:14:36 -07:00
cmds/surfaceflinger	Move keystore to system/security repo	2012-02-15 15:55:21 -08:00
include	Add traits to common utils data structures.	2012-03-16 16:21:21 -07:00
libs	Merge "Added rules to build f/n/libs/utils in 64-bit: lib64utils.a"	2012-03-13 15:48:50 -07:00
opengl	gltrace: Only accept connections from the shell.	2012-03-15 16:41:35 -07:00
services/surfaceflinger	SurfaceTexture: Fully refactored from BufferQueue	2012-03-13 14:39:07 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00