The Android Open Source Project 64a48d284c Reconcile with jb-mr1-release - do not merge ... Change-Id: If7c87d1cb0dc5bb52bb5a6e4b7fa8563c8e30694		2012-10-02 09:18:33 -07:00
build	Fix issue #7257947: Need to fix heap limits on Mako	2012-09-30 16:26:49 -07:00
cmds	Include Global table in bugreports.	2012-10-01 12:52:42 -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 4c273277: Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev	2012-09-28 12:41:24 -07:00
services	Revert "improve sensor fusion" -- DO NOT MERGE	2012-10-01 20:31:05 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00