The Android Open Source Project 4597de963f am 6a92b35e: Reconcile with jb-mr2-release - do not merge ... * commit '6a92b35e3a64c90127fb87530c50e9a04a61c671':		2013-04-11 07:47:08 -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	am 46f19772: resolved conflicts for merge of c76e8a20 to jb-mr2-dev-plus-aosp	2013-04-09 22:33:16 -07:00
opengl	Add liblog	2013-04-09 21:55:39 -07:00
services	Merge "fix another bug where screenshots could end-up all black" into jb-mr2-dev	2013-04-11 04:43:49 +00:00
MODULE_LICENSE_APACHE2
NOTICE