Ed Heyl 6589a42c0d am 98c197d8: merge in KQS81M ... * commit '98c197d826f95a82de41e16350f58a70a7ad23c6': GLConsumer: Add query for current frame number. Disable GLES 2.x rendering Initialize mIndent		2013-10-08 15:57:56 -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	Add feature android.hardware.consumerir xml file	2013-10-03 13:09:37 -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	SurfaceFlinger: SW-based vsync events	2013-10-07 17:59:53 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00