The Android Open Source Project 5adde8dbb8 Reconcile with jb-mr2-release - do not merge ... Change-Id: Ib4728c3dd9e0c91c67a086ca229831495d5fef4c		2013-04-03 16:43:28 -07:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	atrace: add support for app tracing	2013-03-28 13:53:45 -07:00
data/etc	Implement #8323587, #8323342, #8323590: new features.	2013-03-22 17:24:57 -07:00
include	Merge "MediaDrm API update" into jb-mr2-dev	2013-04-02 22:49:23 +00:00
libs	don't use compile-time configuration of libgui as much as possible	2013-03-29 15:33:47 -07:00
opengl	Merge "EGL_ANDROID_presentation_time: initial spec draft" into jb-mr2-dev	2013-04-01 23:27:38 +00:00
services	Fix include paths	2013-04-01 16:54:58 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00