Ying Wang 46f19772ae resolved conflicts for merge of c76e8a20 to jb-mr2-dev-plus-aosp ... Change-Id: I895a8ad8c936a80c70aaac739c6441d3c7c55834		2013-04-09 22:27:50 -07:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	resolved conflicts for merge of c76e8a20 to jb-mr2-dev-plus-aosp	2013-04-09 22:27:50 -07:00
data/etc	Implement #8323587, #8323342, #8323590: new features.	2013-03-22 17:24:57 -07:00
include	Merge changes I82e361a6,I83694682 into jb-mr2-dev	2013-04-09 21:43:20 +00:00
libs	Merge "Add liblog" into jb-mr2-dev	2013-04-10 05:17:07 +00:00
opengl	Add liblog	2013-04-09 21:55:39 -07:00
services	Add liblog	2013-04-09 21:55:39 -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