Dianne Hackborn 290f3f3130 am 9c63cdd6: am ec0f5e5f: Merge "Fix issue #7257947: Need to fix heap limits on Mako" into jb-mr1-dev ... * commit '9c63cdd6b0ff28d3a371aa8c6121411fbf7f0a76': Fix issue #7257947: Need to fix heap limits on Mako		2012-10-01 13:47:56 -07:00
build	Fix issue #7257947: Need to fix heap limits on Mako	2012-09-30 16:26:49 -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	am bba6bb81: am 4c273277: Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev	2012-09-28 12:42:21 -07:00
services	save/restore viewport properly when taking screenshot	2012-09-30 16:43:20 -07: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