The Android Open Source Project 0c6fff72f7 Reconcile with jb-mr1.1-release - do not merge ... Change-Id: I946e9036a50464f974bc2d12df9d8b119f86fa00		2012-12-11 11:54:26 -08:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	bugreport: Add /proc/interrupts dump	2012-11-07 11:09:46 -08:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	am 2d659286: am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async	2012-12-07 10:59:29 -08:00
libs	am 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees	2012-12-10 17:58:33 -08:00
opengl	am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev	2012-11-27 11:39:20 -08:00
services	am 98cbec81: am efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev	2012-11-27 16:10:29 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00