The Android Open Source Project e1b8a7fcee Reconcile with jb-mr2-release - do not merge ... Change-Id: I968ec2bb02006948c3f24c449d2a79a0e2f799f9		2013-04-10 10:05:42 -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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00