The Android Open Source Project c2e5b273c4 Reconcile with jb-mr1.1-release - do not merge ... Change-Id: Ic4f86f5a85ccb35cb054ba6294756456cde4b493		2012-11-06 12:37:30 -08:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	dumpstate: add kernel memory fragmentation unusable index	2012-10-28 22:41:06 -07:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	am 78b4977e: Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-dev	2012-10-25 18:06:06 -07:00
libs	am 04075569: Revert "Revert "put back the unused virtuals in Vector<>""	2012-10-25 11:45:41 -07:00
opengl	am 60393d45: Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev	2012-10-18 17:37:54 -07:00
services	fix transitions from hwc to GLES composition	2012-11-05 17:50:57 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00