The Android Automerger ed9af489ed merge in jb-mr1-release history after reset to jb-mr1-dev		2012-09-30 06:59:40 -07:00
build	Configure GC free to be 8MB for devices with >512MB RAM.	2012-09-23 16:41:57 -07:00
cmds	Merge "Use a named constant rather than a magic number." into jb-mr1-dev	2012-09-17 12:11:25 -07:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Pass display arg to blank/unblank	2012-09-28 13:04:16 -07:00
libs	Pass display arg to blank/unblank	2012-09-28 13:04:16 -07:00
opengl	Re-enable FAST_TLS in gl2 code	2012-09-28 11:56:48 -07:00
services	reset GL viewport and project when caputring the screen	2012-09-28 13:34:26 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00