Jamie Gennis b85d2cf0a2 resolved conflicts for merge of 790b6d09 to master		2013-10-08 17:50:36 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am e4e91c4e: resolved conflicts for merge of e678897f to klp-dev-plus-aosp	2013-09-20 12:53:20 -07:00
data/etc	Add feature android.hardware.consumerir xml file	2013-10-03 13:09:37 -07:00
include	am e71575be: am 48d3741b: Merge "Allow blaming a single uid for work done" into klp-dev	2013-10-04 11:09:01 -07:00
libs	Fix the build	2013-10-03 11:14:09 -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	resolved conflicts for merge of 790b6d09 to master	2013-10-08 17:50:36 -07:00
MODULE_LICENSE_APACHE2
NOTICE