Ramanan Rajeswaran 8948a2efc9 am eda14c1b: am ac006439: Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev ... * commit 'eda14c1bef20d853f2e661244ec6a0f38c3192b7': Revert "Revert "Change SurfaceControl setPosition to take floats""		2013-03-21 15:55:14 +00:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	Merge "Move screenshots near beginning of dumpstate." into jb-mr2-dev	2013-03-20 19:09:45 +00:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev	2013-03-21 15:52:49 +00:00
libs	am eda14c1b: am ac006439: Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev	2013-03-21 15:55:14 +00:00
opengl	Merge "When disconnecting a surface, cancel don't queue the buffer" into jb-mr2-dev	2013-03-07 23:43:56 +00:00
services	rework how we take screenshots for a CPU consumer	2013-03-19 22:22:21 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00