The Android Automerger 0f75097639 merge in jb-mr2-release history after reset to master		2013-01-30 07:10:43 -08:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	Add media.log service	2013-01-16 12:07:03 -08:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Add new format constant	2013-01-17 09:18:29 -08:00
libs	Fix memory leak when getting signal time for unsignaled fences	2013-01-14 16:33:29 -08:00
opengl	Merge "gltrace: Add support for tracing running applications."	2012-12-20 10:52:00 -08:00
services	am fc866eb8: am 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"	2013-01-14 14:41:43 -08: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