The Android Automerger 43ece4ff7b merge in jb-mr2-release history after reset to jb-mr2-dev		2013-04-22 05:55:39 -07:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	Add new resources trace.	2013-04-12 16:58:24 -07:00
data/etc	Implement #8323587, #8323342, #8323590: new features.	2013-03-22 17:24:57 -07:00
include	Merge "BufferItemConsumer: add functions to set default buffer format/size" into jb-mr2-dev	2013-04-17 19:39:53 +00:00
libs	Merge "BufferItemConsumer: add functions to set default buffer format/size" into jb-mr2-dev	2013-04-17 19:39:53 +00:00
opengl	fix "traceGpuCompletion" debug feature	2013-04-16 16:41:47 -07:00
services	allow dumpsys SurfaceFlinger in user builds from the shell user	2013-04-18 16:41:04 -07: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