Jamie Gennis 3b039784c0 am f44e9f91: Merge "atrace: add the webview category" into jb-mr2-dev ... * commit 'f44e9f91f37d3fbed64bc952f241d5dc3c385b6a': atrace: add the webview category		2013-03-12 19:22:52 +00:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	atrace: add the webview category	2013-03-11 19:41:28 -07:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Merge "Add TOUCH_NAVIGATION input source" into jb-mr2-dev	2013-03-12 01:15:48 +00:00
libs	temporary: enable ASSERTs in RefBase	2013-03-11 21:27:16 -07: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	Fix missing recents screenshots	2013-03-11 20:47:24 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00