The Android Automerger 2e4bbb12eb merge in jb-mr2-release history after reset to jb-mr2-dev		2013-04-17 05:55:32 -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 "Updated comments" into jb-mr2-dev	2013-04-11 17:15:52 +00:00
libs	Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES	2013-04-16 23:32:38 -07:00
opengl	fix "traceGpuCompletion" debug feature	2013-04-16 16:41:47 -07:00
services	Merge "make sure to update the "current state" when we "fake" the transaction" into jb-mr2-dev	2013-04-13 00:27:32 +00:00
MODULE_LICENSE_APACHE2
NOTICE