Mathias Agopian 48be323236 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
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	Merge "Updated comments" into jb-mr2-dev	2013-04-11 17:15:52 +00:00
opengl	Add liblog	2013-04-09 21:55:39 -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	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