The Android Open Source Project 7cd393f12a am f76c31ce: (-s ours) Reconcile with jb-mr1-release - do not merge ... * commit 'f76c31ce58ad02e50af916d9e47cce1b68f85edf':		2012-09-28 00:32:38 -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	fix a crasher when running out of memory	2012-09-25 15:30:38 -07:00
libs	Show build config in dumpsys SurfaceFlinger	2012-09-25 11:31:46 -07:00
opengl	am 2ac41948: am 1e83690c: Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev	2012-09-26 18:51:49 -07:00
services	Merge "Recompute visible regions more vigorously" into jb-mr1-dev	2012-09-26 17:27:43 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00