The Android Automerger 282b79d7c1 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev		2012-11-27 15:34:35 -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	Reduce emulator logspam	2012-11-08 16:40:11 -08:00
libs	fix typo that broke all the builds	2012-11-19 16:50:24 -08:00
opengl	Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev	2012-11-27 07:36:50 -08:00
services	workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]	2012-11-19 15:07:33 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00