The Android Open Source Project f4ba648eb1 am 3c078da2: (-s ours) Reconcile with jb-mr2-release - do not merge ... * commit '3c078da2f2326ffbed87fc99ba4842d0e8aee6e4':		2013-03-05 15:58:53 +00:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	am 22641851: Merge "dumpstate: use correct header file."	2013-03-01 18:05:56 +00:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Merge "rework screenshot API and implementation" into jb-mr2-dev	2013-03-05 02:30:13 +00:00
libs	Merge "rework screenshot API and implementation" into jb-mr2-dev	2013-03-05 02:30:13 +00:00
opengl	add some missing parameter validation in GLES java bindings	2013-02-25 16:50:51 -08:00
services	Merge "rework screenshot API and implementation" into jb-mr2-dev	2013-03-05 02:30:13 +00:00
MODULE_LICENSE_APACHE2
NOTICE