Marco Nelissen e71575bed4 am 48d3741b: Merge "Allow blaming a single uid for work done" into klp-dev ... * commit '48d3741ba5f4b3bb411ee5c083a11f4f52f9e907': Allow blaming a single uid for work done		2013-10-03 15:40:30 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	resolved conflicts for merge of e678897f to klp-dev-plus-aosp	2013-09-20 12:45:20 -07:00
data/etc	Enable FEATURE_DEVICE_ADMIN for handheld devices	2013-09-16 10:48:35 -07:00
include	Merge "Allow blaming a single uid for work done" into klp-dev	2013-10-03 16:34:51 +00:00
libs	am f0cf5f10: BufferQueue: fix a test crash	2013-10-02 11:16:59 -07:00
opengl	am a9c47f32: Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev	2013-10-02 10:41:58 -07:00
services	Merge "Allow blaming a single uid for work done" into klp-dev	2013-10-03 16:34:51 +00:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00